Skip to content

Commit d3e4ddf

Browse files
authored
Merge pull request #13 from factorhouse/hotfix/update-values-schema-json-data-types
Update data types in values.schema.json
2 parents 8821ff2 + 6fe9402 commit d3e4ddf

File tree

8 files changed

+28
-60
lines changed

8 files changed

+28
-60
lines changed

charts/flex-ce/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: flex-ce
33
description: Run Flex for Apache Flink Community Edition in Kubernetes
44
type: application
5-
version: 1.0.67
5+
version: 1.0.68
66
appVersion: "94.4"
77
keywords:
88
- flink

charts/flex-ce/values.schema.json

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
"type": "object"
3030
},
3131
"envFromConfigMap": {
32-
"type": "null"
32+
"type": ["string", "null"]
3333
},
3434
"envFromSecret": {
35-
"type": "null"
35+
"type": ["string", "null"]
3636
},
3737
"fullnameOverride": {
3838
"type": "string"
@@ -95,23 +95,15 @@
9595
"limits": {
9696
"type": "object",
9797
"properties": {
98-
"cpu": {
99-
"type": "integer"
100-
},
101-
"memory": {
102-
"type": "string"
103-
}
98+
"cpu": { "type": ["integer", "string"] },
99+
"memory": { "type": ["integer", "string"] }
104100
}
105101
},
106102
"requests": {
107103
"type": "object",
108104
"properties": {
109-
"cpu": {
110-
"type": "integer"
111-
},
112-
"memory": {
113-
"type": "string"
114-
}
105+
"cpu": { "type": ["integer", "string"] },
106+
"memory": { "type": ["integer", "string"] }
115107
}
116108
}
117109
}

charts/flex/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: flex
33
description: Run Flex for Apache Flink in Kubernetes
44
type: application
5-
version: 1.0.67
5+
version: 1.0.68
66
appVersion: "94.4"
77
keywords:
88
- flink

charts/flex/values.schema.json

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
"type": "object"
3030
},
3131
"envFromConfigMap": {
32-
"type": "null"
32+
"type": ["string", "null"]
3333
},
3434
"envFromSecret": {
35-
"type": "null"
35+
"type": ["string", "null"]
3636
},
3737
"fullnameOverride": {
3838
"type": "string"
@@ -95,23 +95,15 @@
9595
"limits": {
9696
"type": "object",
9797
"properties": {
98-
"cpu": {
99-
"type": "integer"
100-
},
101-
"memory": {
102-
"type": "string"
103-
}
98+
"cpu": { "type": ["integer", "string"] },
99+
"memory": { "type": ["integer", "string"] }
104100
}
105101
},
106102
"requests": {
107103
"type": "object",
108104
"properties": {
109-
"cpu": {
110-
"type": "integer"
111-
},
112-
"memory": {
113-
"type": "string"
114-
}
105+
"cpu": { "type": ["integer", "string"] },
106+
"memory": { "type": ["integer", "string"] }
115107
}
116108
}
117109
}

charts/kpow-ce/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: kpow-ce
33
description: Run Kpow for Apache Kafka Community Edition in Kubernetes
44
type: application
5-
version: 1.0.67
5+
version: 1.0.68
66
appVersion: "94.4"
77
keywords:
88
- kafka

charts/kpow-ce/values.schema.json

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
"type": "object"
3030
},
3131
"envFromConfigMap": {
32-
"type": "null"
32+
"type": ["string", "null"]
3333
},
3434
"envFromSecret": {
35-
"type": "null"
35+
"type": ["string", "null"]
3636
},
3737
"ephemeralTmp": {
3838
"type": "object",
@@ -130,23 +130,15 @@
130130
"limits": {
131131
"type": "object",
132132
"properties": {
133-
"cpu": {
134-
"type": "integer"
135-
},
136-
"memory": {
137-
"type": "string"
138-
}
133+
"cpu": { "type": ["integer", "string"] },
134+
"memory": { "type": ["integer", "string"] }
139135
}
140136
},
141137
"requests": {
142138
"type": "object",
143139
"properties": {
144-
"cpu": {
145-
"type": "integer"
146-
},
147-
"memory": {
148-
"type": "string"
149-
}
140+
"cpu": { "type": ["integer", "string"] },
141+
"memory": { "type": ["integer", "string"] }
150142
}
151143
}
152144
}

charts/kpow/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: kpow
33
description: Run Kpow for Apache Kafka in Kubernetes
44
type: application
5-
version: 1.0.67
5+
version: 1.0.68
66
appVersion: "94.4"
77
keywords:
88
- kafka

charts/kpow/values.schema.json

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
"type": "object"
3030
},
3131
"envFromConfigMap": {
32-
"type": "null"
32+
"type": ["string", "null"]
3333
},
3434
"envFromSecret": {
35-
"type": "null"
35+
"type": ["string", "null"]
3636
},
3737
"ephemeralTmp": {
3838
"type": "object",
@@ -130,23 +130,15 @@
130130
"limits": {
131131
"type": "object",
132132
"properties": {
133-
"cpu": {
134-
"type": "integer"
135-
},
136-
"memory": {
137-
"type": "string"
138-
}
133+
"cpu": { "type": ["integer", "string"] },
134+
"memory": { "type": ["integer", "string"] }
139135
}
140136
},
141137
"requests": {
142138
"type": "object",
143139
"properties": {
144-
"cpu": {
145-
"type": "integer"
146-
},
147-
"memory": {
148-
"type": "string"
149-
}
140+
"cpu": { "type": ["integer", "string"] },
141+
"memory": { "type": ["integer", "string"] }
150142
}
151143
}
152144
}

0 commit comments

Comments
 (0)