diff --git a/charts/metering-ansible-operator/templates/crds/meteringconfig.crd.yaml b/charts/metering-ansible-operator/templates/crds/meteringconfig.crd.yaml index e5aa1b3d4..5a7a43350 100644 --- a/charts/metering-ansible-operator/templates/crds/meteringconfig.crd.yaml +++ b/charts/metering-ansible-operator/templates/crds/meteringconfig.crd.yaml @@ -1444,6 +1444,8 @@ spec: hive: type: object properties: + useHadoopConfig: + type: boolean hadoopConfigSecretName: type: string metastoreTimeout: @@ -1528,8 +1530,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 index 0c62f1bb2..53a60bec9 100644 --- a/charts/openshift-metering/templates/presto/_presto_helpers.tpl +++ b/charts/openshift-metering/templates/presto/_presto_helpers.tpl @@ -18,6 +18,10 @@ 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 }} @@ -25,6 +29,8 @@ hive.config.resources=/hadoop-config/core-site.xml 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 index fe5fa5236..482b8199c 100644 --- a/charts/openshift-metering/values.yaml +++ b/charts/openshift-metering/values.yaml @@ -536,6 +536,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 index 213eb9350..5b2211991 100644 --- a/manifests/deploy/ocp-testing/metering-ansible-operator/meteringconfig.crd.yaml +++ b/manifests/deploy/ocp-testing/metering-ansible-operator/meteringconfig.crd.yaml @@ -1443,6 +1443,8 @@ spec: hive: type: object properties: + useHadoopConfig: + type: boolean hadoopConfigSecretName: type: string metastoreTimeout: @@ -1527,8 +1529,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 index 213eb9350..5b2211991 100644 --- a/manifests/deploy/ocp-testing/olm/bundle/4.3/meteringconfig.crd.yaml +++ b/manifests/deploy/ocp-testing/olm/bundle/4.3/meteringconfig.crd.yaml @@ -1443,6 +1443,8 @@ spec: hive: type: object properties: + useHadoopConfig: + type: boolean hadoopConfigSecretName: type: string metastoreTimeout: @@ -1527,8 +1529,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 index 213eb9350..5b2211991 100644 --- a/manifests/deploy/openshift/metering-ansible-operator/meteringconfig.crd.yaml +++ b/manifests/deploy/openshift/metering-ansible-operator/meteringconfig.crd.yaml @@ -1443,6 +1443,8 @@ spec: hive: type: object properties: + useHadoopConfig: + type: boolean hadoopConfigSecretName: type: string metastoreTimeout: @@ -1527,8 +1529,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 index 213eb9350..5b2211991 100644 --- a/manifests/deploy/openshift/olm/bundle/4.3/meteringconfig.crd.yaml +++ b/manifests/deploy/openshift/olm/bundle/4.3/meteringconfig.crd.yaml @@ -1443,6 +1443,8 @@ spec: hive: type: object properties: + useHadoopConfig: + type: boolean hadoopConfigSecretName: type: string metastoreTimeout: @@ -1527,8 +1529,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 index 0ccd93952..a199796a2 100644 --- 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 index 213eb9350..5b2211991 100644 --- a/manifests/deploy/upstream/metering-ansible-operator/meteringconfig.crd.yaml +++ b/manifests/deploy/upstream/metering-ansible-operator/meteringconfig.crd.yaml @@ -1443,6 +1443,8 @@ spec: hive: type: object properties: + useHadoopConfig: + type: boolean hadoopConfigSecretName: type: string metastoreTimeout: @@ -1527,8 +1529,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 index 213eb9350..5b2211991 100644 --- a/manifests/deploy/upstream/olm/bundle/4.3/meteringconfig.crd.yaml +++ b/manifests/deploy/upstream/olm/bundle/4.3/meteringconfig.crd.yaml @@ -1443,6 +1443,8 @@ spec: hive: type: object properties: + useHadoopConfig: + type: boolean hadoopConfigSecretName: type: string metastoreTimeout: @@ -1527,8 +1529,11 @@ spec: - true secretName: minLength: 1 - useHadoopConfig: - type: boolean + s3: + type: object + properties: + useInstanceCredentials: + type: boolean environment: type: string maxQueryLength: