Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

charts,manifests: Support configuring Presto hive.s3.use-instance-credentials Hive catalog config property #991

Merged
merged 1 commit into from
Oct 29, 2019
Merged

charts,manifests: Support configuring Presto hive.s3.use-instance-credentials Hive catalog config property #991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions charts/metering-ansible-operator/templates/crds/meteringconfig.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1444,6 +1444,8 @@ spec:
hive:
type: object
properties:
useHadoopConfig:
type: boolean
hadoopConfigSecretName:
type: string
metastoreTimeout:
Expand Down Expand Up @@ -1528,8 +1530,11 @@ spec:
- true
secretName:
minLength: 1
useHadoopConfig:
type: boolean
s3:
type: object
properties:
useInstanceCredentials:
type: boolean
environment:
type: string
maxQueryLength:
Expand Down
6 changes: 6 additions & 0 deletions charts/openshift-metering/templates/presto/_presto_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" -}}
Expand Down
2 changes: 2 additions & 0 deletions charts/openshift-metering/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,8 @@ presto:
createSecret: false
enabled: false
secretName: ""
s3:
useInstanceCredentials: null

extraConnectorFiles: []

Expand Down
9 changes: 7 additions & 2 deletions manifests/deploy/ocp-testing/metering-ansible-operator/meteringconfig.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1443,6 +1443,8 @@ spec:
hive:
type: object
properties:
useHadoopConfig:
type: boolean
hadoopConfigSecretName:
type: string
metastoreTimeout:
Expand Down Expand Up @@ -1527,8 +1529,11 @@ spec:
- true
secretName:
minLength: 1
useHadoopConfig:
type: boolean
s3:
type: object
properties:
useInstanceCredentials:
type: boolean
environment:
type: string
maxQueryLength:
Expand Down
9 changes: 7 additions & 2 deletions manifests/deploy/ocp-testing/olm/bundle/4.3/meteringconfig.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1443,6 +1443,8 @@ spec:
hive:
type: object
properties:
useHadoopConfig:
type: boolean
hadoopConfigSecretName:
type: string
metastoreTimeout:
Expand Down Expand Up @@ -1527,8 +1529,11 @@ spec:
- true
secretName:
minLength: 1
useHadoopConfig:
type: boolean
s3:
type: object
properties:
useInstanceCredentials:
type: boolean
environment:
type: string
maxQueryLength:
Expand Down
9 changes: 7 additions & 2 deletions manifests/deploy/openshift/metering-ansible-operator/meteringconfig.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1443,6 +1443,8 @@ spec:
hive:
type: object
properties:
useHadoopConfig:
type: boolean
hadoopConfigSecretName:
type: string
metastoreTimeout:
Expand Down Expand Up @@ -1527,8 +1529,11 @@ spec:
- true
secretName:
minLength: 1
useHadoopConfig:
type: boolean
s3:
type: object
properties:
useInstanceCredentials:
type: boolean
environment:
type: string
maxQueryLength:
Expand Down
9 changes: 7 additions & 2 deletions manifests/deploy/openshift/olm/bundle/4.3/meteringconfig.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1443,6 +1443,8 @@ spec:
hive:
type: object
properties:
useHadoopConfig:
type: boolean
hadoopConfigSecretName:
type: string
metastoreTimeout:
Expand Down Expand Up @@ -1527,8 +1529,11 @@ spec:
- true
secretName:
minLength: 1
useHadoopConfig:
type: boolean
s3:
type: object
properties:
useInstanceCredentials:
type: boolean
environment:
type: string
maxQueryLength:
Expand Down
5 changes: 5 additions & 0 deletions manifests/deploy/openshift/telemeter/list.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1447,6 +1447,11 @@ objects:
type: string
metastoreURI:
type: string
s3:
properties:
useInstanceCredentials:
type: boolean
type: object
tls:
oneOf:
- allOf:
Expand Down
9 changes: 7 additions & 2 deletions manifests/deploy/upstream/metering-ansible-operator/meteringconfig.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1443,6 +1443,8 @@ spec:
hive:
type: object
properties:
useHadoopConfig:
type: boolean
hadoopConfigSecretName:
type: string
metastoreTimeout:
Expand Down Expand Up @@ -1527,8 +1529,11 @@ spec:
- true
secretName:
minLength: 1
useHadoopConfig:
type: boolean
s3:
type: object
properties:
useInstanceCredentials:
type: boolean
environment:
type: string
maxQueryLength:
Expand Down
9 changes: 7 additions & 2 deletions manifests/deploy/upstream/olm/bundle/4.3/meteringconfig.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1443,6 +1443,8 @@ spec:
hive:
type: object
properties:
useHadoopConfig:
type: boolean
hadoopConfigSecretName:
type: string
metastoreTimeout:
Expand Down Expand Up @@ -1527,8 +1529,11 @@ spec:
- true
secretName:
minLength: 1
useHadoopConfig:
type: boolean
s3:
type: object
properties:
useInstanceCredentials:
type: boolean
environment:
type: string
maxQueryLength:
Expand Down