Merge pull request #991 from chancez/presto_hive_instance_creds

charts,manifests: Support configuring Presto hive.s3.use-instance-credentials Hive catalog config property
kube-reporting · Oct 29, 2019 · 49435ce · 49435ce
2 parents 38229d3 + 8567eb0
commit 49435ce
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 14 deletions.
diff --git a/charts/metering-ansible-operator/templates/crds/meteringconfig.crd.yaml b/charts/metering-ansible-operator/templates/crds/meteringconfig.crd.yaml
@@ -1458,6 +1458,8 @@ spec:
                             hive:
                               type: object
                               properties:
+                                useHadoopConfig:
+                                  type: boolean
                                 hadoopConfigSecretName:
                                   type: string
                                 metastoreTimeout:
@@ -1542,8 +1544,11 @@ spec:
                                         - true
                                       secretName:
                                         minLength: 1
-                                useHadoopConfig:
-                                  type: boolean
+                                s3:
+                                  type: object
+                                  properties:
+                                    useInstanceCredentials:
+                                      type: boolean
                         environment:
                           type: string
                         maxQueryLength:

diff --git a/charts/openshift-metering/templates/presto/_presto_helpers.tpl b/charts/openshift-metering/templates/presto/_presto_helpers.tpl
@@ -18,13 +18,19 @@ hive.metastore.uri=thrift://hive-metastore:9083
 {{- if .Values.presto.spec.config.connectors.hive.metastoreTimeout }}
 hive.metastore-timeout={{ .Values.presto.spec.config.connectors.hive.metastoreTimeout }}
 {{- end }}
+{{- if .Values.presto.spec.config.connectors.hive.s3.useInstanceCredentials }}
+hive.s3.use-instance-credentials={{ .Values.presto.spec.config.connectors.hive.s3.useInstanceCredentials }}
+{{- end }}
+
 {{- if .Values.presto.spec.config.connectors.hive.useHadoopConfig}}
 hive.config.resources=/hadoop-config/core-site.xml
 {{- end }}
 {{- if .Values.presto.spec.config.s3Compatible.endpoint }}
 hive.s3.endpoint={{ .Values.presto.spec.config.s3Compatible.endpoint }}
 hive.s3.path-style-access=true
 {{- end }}
+
+
 {{- end }}
 
 {{- define "presto-jmx-catalog-properties" -}}

diff --git a/charts/openshift-metering/values.yaml b/charts/openshift-metering/values.yaml
@@ -540,6 +540,8 @@ presto:
             createSecret: false
             enabled: false
             secretName: ""
+          s3:
+            useInstanceCredentials: null
 
         extraConnectorFiles: []
 

diff --git a/manifests/deploy/ocp-testing/metering-ansible-operator/meteringconfig.crd.yaml b/manifests/deploy/ocp-testing/metering-ansible-operator/meteringconfig.crd.yaml
@@ -1457,6 +1457,8 @@ spec:
                             hive:
                               type: object
                               properties:
+                                useHadoopConfig:
+                                  type: boolean
                                 hadoopConfigSecretName:
                                   type: string
                                 metastoreTimeout:
@@ -1541,8 +1543,11 @@ spec:
                                         - true
                                       secretName:
                                         minLength: 1
-                                useHadoopConfig:
-                                  type: boolean
+                                s3:
+                                  type: object
+                                  properties:
+                                    useInstanceCredentials:
+                                      type: boolean
                         environment:
                           type: string
                         maxQueryLength:

diff --git a/manifests/deploy/ocp-testing/olm/bundle/4.3/meteringconfig.crd.yaml b/manifests/deploy/ocp-testing/olm/bundle/4.3/meteringconfig.crd.yaml
@@ -1457,6 +1457,8 @@ spec:
                             hive:
                               type: object
                               properties:
+                                useHadoopConfig:
+                                  type: boolean
                                 hadoopConfigSecretName:
                                   type: string
                                 metastoreTimeout:
@@ -1541,8 +1543,11 @@ spec:
                                         - true
                                       secretName:
                                         minLength: 1
-                                useHadoopConfig:
-                                  type: boolean
+                                s3:
+                                  type: object
+                                  properties:
+                                    useInstanceCredentials:
+                                      type: boolean
                         environment:
                           type: string
                         maxQueryLength:

diff --git a/manifests/deploy/openshift/metering-ansible-operator/meteringconfig.crd.yaml b/manifests/deploy/openshift/metering-ansible-operator/meteringconfig.crd.yaml
@@ -1457,6 +1457,8 @@ spec:
                             hive:
                               type: object
                               properties:
+                                useHadoopConfig:
+                                  type: boolean
                                 hadoopConfigSecretName:
                                   type: string
                                 metastoreTimeout:
@@ -1541,8 +1543,11 @@ spec:
                                         - true
                                       secretName:
                                         minLength: 1
-                                useHadoopConfig:
-                                  type: boolean
+                                s3:
+                                  type: object
+                                  properties:
+                                    useInstanceCredentials:
+                                      type: boolean
                         environment:
                           type: string
                         maxQueryLength:

diff --git a/manifests/deploy/openshift/olm/bundle/4.3/meteringconfig.crd.yaml b/manifests/deploy/openshift/olm/bundle/4.3/meteringconfig.crd.yaml
@@ -1457,6 +1457,8 @@ spec:
                             hive:
                               type: object
                               properties:
+                                useHadoopConfig:
+                                  type: boolean
                                 hadoopConfigSecretName:
                                   type: string
                                 metastoreTimeout:
@@ -1541,8 +1543,11 @@ spec:
                                         - true
                                       secretName:
                                         minLength: 1
-                                useHadoopConfig:
-                                  type: boolean
+                                s3:
+                                  type: object
+                                  properties:
+                                    useInstanceCredentials:
+                                      type: boolean
                         environment:
                           type: string
                         maxQueryLength:

diff --git a/manifests/deploy/openshift/telemeter/list.yaml b/manifests/deploy/openshift/telemeter/list.yaml
@@ -1447,6 +1447,11 @@ objects:
                                     type: string
                                   metastoreURI:
                                     type: string
+                                  s3:
+                                    properties:
+                                      useInstanceCredentials:
+                                        type: boolean
+                                    type: object
                                   tls:
                                     oneOf:
                                     - allOf:

diff --git a/manifests/deploy/upstream/metering-ansible-operator/meteringconfig.crd.yaml b/manifests/deploy/upstream/metering-ansible-operator/meteringconfig.crd.yaml
@@ -1457,6 +1457,8 @@ spec:
                             hive:
                               type: object
                               properties:
+                                useHadoopConfig:
+                                  type: boolean
                                 hadoopConfigSecretName:
                                   type: string
                                 metastoreTimeout:
@@ -1541,8 +1543,11 @@ spec:
                                         - true
                                       secretName:
                                         minLength: 1
-                                useHadoopConfig:
-                                  type: boolean
+                                s3:
+                                  type: object
+                                  properties:
+                                    useInstanceCredentials:
+                                      type: boolean
                         environment:
                           type: string
                         maxQueryLength:

diff --git a/manifests/deploy/upstream/olm/bundle/4.3/meteringconfig.crd.yaml b/manifests/deploy/upstream/olm/bundle/4.3/meteringconfig.crd.yaml
@@ -1457,6 +1457,8 @@ spec:
                             hive:
                               type: object
                               properties:
+                                useHadoopConfig:
+                                  type: boolean
                                 hadoopConfigSecretName:
                                   type: string
                                 metastoreTimeout:
@@ -1541,8 +1543,11 @@ spec:
                                         - true
                                       secretName:
                                         minLength: 1
-                                useHadoopConfig:
-                                  type: boolean
+                                s3:
+                                  type: object
+                                  properties:
+                                    useInstanceCredentials:
+                                      type: boolean
                         environment:
                           type: string
                         maxQueryLength: