Skip to content
This repository was archived by the owner on Sep 18, 2024. It is now read-only.

Commit ecfc28a

Browse files
fcomtefcomte
committed
hive metastore x-onyxia
1 parent cf8c752 commit ecfc28a

File tree

4 files changed

+69
-24
lines changed

4 files changed

+69
-24
lines changed

‎charts/hive-metastore/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ type: application
2525
# This is the chart version. This version number should be incremented each time you make changes
2626
# to the chart and its templates, including the app version.
2727
# Versions are expected to follow Semantic Versioning (https://semver.org/)
28-
version: 1.2.4
28+
version: 1.3.0
2929

3030
# This is the version number of the application being deployed. This version number should be
3131
# incremented each time you make changes to the application. Versions are not expected to

‎charts/hive-metastore/templates/configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ data:
3535
<name> hive.metastore.warehouse.dir</name>
3636
<value>{{ .Values.service.warehouseDir}}</value>
3737
</property>
38-
{{- if .Values.environment.s3 }}
38+
{{- if .Values.s3.enabled }}
3939
<property>
4040
<name>fs.s3a.connection.ssl.enabled</name>
4141
<value>true</value>

‎charts/hive-metastore/values.schema.json

+66-21
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
"default": "/user/hive/warehouse/",
1313
"x-form": {
1414
"value": "s3a://{{s3.AWS_BUCKET_NAME}}/hive-warehouse"
15+
},
16+
"x-onyxia": {
17+
"overwriteDefaultWith": "s3a://{{s3.AWS_BUCKET_NAME}}/hive-warehouse"
1518
}
1619
},
1720
"image" : {
@@ -64,63 +67,87 @@
6467
}
6568
}
6669
},
67-
"environment": {
68-
"description": "configuration of your environment variables",
70+
"s3": {
71+
"description": "Configuration of temporary identity",
6972
"type": "object",
7073
"properties": {
71-
"s3": {
74+
"enabled": {
7275
"type": "boolean",
7376
"description": "Add S3 temporary identity inside your environment",
7477
"default": true
75-
}
76-
}
77-
},
78-
"s3": {
79-
"description": "Configuration of temporary identity",
80-
"type": "object",
81-
"properties": {
78+
},
8279
"accessKeyId": {
8380
"description": "AWS Access Key",
8481
"type": "string",
8582
"x-form": {
86-
"value": "{{s3.AWS_ACCESS_KEY_ID}}",
87-
"hidden": true
83+
"value": "{{s3.AWS_ACCESS_KEY_ID}}"
84+
},
85+
"x-onyxia": {
86+
"overwriteDefaultWith": "{{s3.AWS_ACCESS_KEY_ID}}"
87+
},
88+
"hidden": {
89+
"value": false,
90+
"path": "s3/enabled"
8891
}
8992
},
9093
"endpoint": {
9194
"description": "AWS S3 Endpoint",
9295
"type": "string",
9396
"x-form": {
94-
"value": "{{s3.AWS_S3_ENDPOINT}}",
95-
"hidden": true
97+
"value": "{{s3.AWS_S3_ENDPOINT}}"
98+
},
99+
"x-onyxia": {
100+
"overwriteDefaultWith": "{{s3.AWS_S3_ENDPOINT}}"
101+
},
102+
"hidden": {
103+
"value": false,
104+
"path": "s3/enabled"
96105
}
97106
},
98107
"defaultRegion": {
99108
"description": "AWS S3 default region",
100109
"type": "string",
101110
"x-form": {
102-
"value": "{{s3.AWS_DEFAULT_REGION}}",
103-
"hidden": true
111+
"value": "{{s3.AWS_DEFAULT_REGION}}"
112+
},
113+
"x-onyxia": {
114+
"overwriteDefaultWith": "{{s3.AWS_DEFAULT_REGION}}"
115+
},
116+
"hidden": {
117+
"value": false,
118+
"path": "s3/enabled"
104119
}
105120
},
106121
"secretAccessKey": {
107122
"description": "AWS S3 secret access key",
108123
"type": "string",
109124
"x-form": {
110-
"value": "{{s3.AWS_SECRET_ACCESS_KEY}}",
111-
"hidden": true
125+
"value": "{{s3.AWS_SECRET_ACCESS_KEY}}"
126+
},
127+
"x-onyxia": {
128+
"overwriteDefaultWith": "{{s3.AWS_SECRET_ACCESS_KEY}}"
129+
},
130+
"hidden": {
131+
"value": false,
132+
"path": "s3/enabled"
112133
}
113134
},
114135
"sessionToken": {
115136
"description": "AWS S3 session Token",
116137
"type": "string",
117138
"x-form": {
118-
"value": "{{s3.AWS_SESSION_TOKEN}}",
119-
"hidden": true
139+
"value": "{{s3.AWS_SESSION_TOKEN}}"
140+
},
141+
"x-onyxia": {
142+
"overwriteDefaultWith": "{{s3.AWS_SESSION_TOKEN}}"
143+
},
144+
"hidden": {
145+
"value": false,
146+
"path": "s3/enabled"
120147
}
121148
}
122149
}
123-
},
150+
},
124151
"security": {
125152
"description": "security specific configuration",
126153
"type": "object",
@@ -136,6 +163,9 @@
136163
"default": true,
137164
"x-form": {
138165
"value": "{{region.defaultNetworkPolicy}}"
166+
},
167+
"x-onyxia": {
168+
"overwriteDefaultWith": "region.defaultNetworkPolicy"
139169
}
140170
}
141171
}
@@ -161,6 +191,9 @@
161191
},
162192
"x-form": {
163193
"value": "{{region.kafka.url}}"
194+
},
195+
"x-onyxia": {
196+
"overwriteDefaultWith": "{{region.kafka.url}}"
164197
}
165198

166199
},
@@ -174,6 +207,9 @@
174207
},
175208
"x-form": {
176209
"value": "{{region.kafka.topicName}}"
210+
},
211+
"x-onyxia": {
212+
"overwriteDefaultWith": "{{region.kafka.topicName}}"
177213
}
178214
},
179215
"domainNamespace": {
@@ -182,6 +218,9 @@
182218
"x-form": {
183219
"value": "{{project.id}}"
184220
},
221+
"x-onyxia": {
222+
"overwriteDefaultWith": "{{project.id}}"
223+
},
185224
"default": "changeMe",
186225
"hidden": {
187226
"value": false,
@@ -206,6 +245,9 @@
206245
"default": "admin",
207246
"x-form": {
208247
"value": "{{project.id}}"
248+
},
249+
"x-onyxia": {
250+
"overwriteDefaultWith": "{{project.id}}"
209251
}
210252
},
211253
"postgresqlPassword": {
@@ -214,6 +256,9 @@
214256
"default": "changeme",
215257
"x-form": {
216258
"value": "{{project.password}}"
259+
},
260+
"x-onyxia": {
261+
"overwriteDefaultWith": "{{project.password}}"
217262
}
218263
},
219264
"postgresqlDatabase": {

‎charts/hive-metastore/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ environment:
2424

2525
s3:
2626
# Specifies whether a config map should be created
27-
create: true
27+
enabled: false
2828
# The name of the configmap to use.
2929
# If not set and create is true, a name is generated using the fullname template
3030
configMapName: ""

0 commit comments

Comments
 (0)