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.

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] mount aws profile secret as volume to all charts required for telemetry #175

Merged
merged 1 commit into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion charts/bigdata-notebook-service/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: bigdata-notebook-service
description: A Helm chart for the Spot Big Data Notebook Service
type: application
version: 0.2.3
version: 0.2.4
appVersion: 0.1.16
home: https://github.com/spotinst/charts
icon: https://docs.spot.io/_media/images/spot_mark.png
Expand Down
15 changes: 5 additions & 10 deletions charts/bigdata-notebook-service/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,6 @@ spec:
containerPort: 2020
protocol: TCP
env:
- name: AWS_ACCESS_KEY_ID
valueFrom:
secretKeyRef:
name: spot-bigdata-telemetry-creds
key: AWS_ACCESS_KEY_ID
- name: AWS_SECRET_ACCESS_KEY
valueFrom:
secretKeyRef:
name: spot-bigdata-telemetry-creds
key: AWS_SECRET_ACCESS_KEY
- name: AWS_BUCKET_NAME
valueFrom:
secretKeyRef:
Expand Down Expand Up @@ -187,6 +177,8 @@ spec:
- name: varlibdockercontainers
readOnly: true
mountPath: /var/lib/docker/containers
- name: telemetry-aws-credentials
mountPath: /root/.aws
volumes:
- name: config
configMap:
Expand All @@ -197,6 +189,9 @@ spec:
- name: varlibdockercontainers
hostPath:
path: /var/lib/docker/containers
- name: telemetry-aws-credentials
secret:
secretName: spot-bigdata-telemetry-creds
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
Expand Down
2 changes: 1 addition & 1 deletion charts/bigdata-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: bigdata-operator
description: Spot Ocean BigData Operator
type: application
version: 0.4.4
version: 0.4.5
appVersion: 0.4.3
home: https://github.com/spotinst/charts
icon: https://docs.spot.io/_media/images/spot_mark.png
Expand Down
17 changes: 6 additions & 11 deletions charts/bigdata-operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,6 @@ spec:
containerPort: 2020
protocol: TCP
env:
- name: AWS_ACCESS_KEY_ID
valueFrom:
secretKeyRef:
name: spot-bigdata-telemetry-creds
key: AWS_ACCESS_KEY_ID
- name: AWS_SECRET_ACCESS_KEY
valueFrom:
secretKeyRef:
name: spot-bigdata-telemetry-creds
key: AWS_SECRET_ACCESS_KEY
- name: AWS_BUCKET_NAME
valueFrom:
secretKeyRef:
Expand Down Expand Up @@ -137,6 +127,8 @@ spec:
- name: varlibdockercontainers
readOnly: true
mountPath: /var/lib/docker/containers
- name: telemetry-aws-credentials
mountPath: /root/.aws
volumes:
- name: config
configMap:
Expand All @@ -147,6 +139,9 @@ spec:
- name: varlibdockercontainers
hostPath:
path: /var/lib/docker/containers
- name: telemetry-aws-credentials
secret:
secretName: spot-bigdata-telemetry-creds
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
Expand All @@ -159,4 +154,4 @@ spec:
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/bigdata-proxy/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: bigdata-proxy
description: A Helm chart for the Spot Big Data Proxy
type: application
version: 0.4.3
version: 0.4.4
appVersion: 0.5.3
home: https://github.com/spotinst/charts
icon: https://docs.spot.io/_media/images/spot_mark.png
Expand Down
15 changes: 5 additions & 10 deletions charts/bigdata-proxy/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,6 @@ spec:
containerPort: 2020
protocol: TCP
env:
- name: AWS_ACCESS_KEY_ID
valueFrom:
secretKeyRef:
name: spot-bigdata-telemetry-creds
key: AWS_ACCESS_KEY_ID
- name: AWS_SECRET_ACCESS_KEY
valueFrom:
secretKeyRef:
name: spot-bigdata-telemetry-creds
key: AWS_SECRET_ACCESS_KEY
- name: AWS_BUCKET_NAME
valueFrom:
secretKeyRef:
Expand Down Expand Up @@ -102,6 +92,8 @@ spec:
- name: varlibdockercontainers
readOnly: true
mountPath: /var/lib/docker/containers
- name: telemetry-aws-credentials
mountPath: /root/.aws
volumes:
- name: config
configMap:
Expand All @@ -112,6 +104,9 @@ spec:
- name: varlibdockercontainers
hostPath:
path: /var/lib/docker/containers
- name: telemetry-aws-credentials
secret:
secretName: spot-bigdata-telemetry-creds
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
Expand Down
2 changes: 1 addition & 1 deletion charts/bigdata-spark-watcher/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: bigdata-spark-watcher
description: A Helm chart for the Spot Big Data Spark Watcher
type: application
version: 0.5.0
version: 0.5.1
appVersion: 0.4.5
home: https://github.com/spotinst/charts
icon: https://docs.spot.io/_media/images/spot_mark.png
Expand Down
15 changes: 5 additions & 10 deletions charts/bigdata-spark-watcher/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,6 @@ spec:
containerPort: 2020
protocol: TCP
env:
- name: AWS_ACCESS_KEY_ID
valueFrom:
secretKeyRef:
name: spot-bigdata-telemetry-creds
key: AWS_ACCESS_KEY_ID
- name: AWS_SECRET_ACCESS_KEY
valueFrom:
secretKeyRef:
name: spot-bigdata-telemetry-creds
key: AWS_SECRET_ACCESS_KEY
- name: AWS_BUCKET_NAME
valueFrom:
secretKeyRef:
Expand Down Expand Up @@ -129,6 +119,8 @@ spec:
- name: varlibdockercontainers
readOnly: true
mountPath: /var/lib/docker/containers
- name: telemetry-aws-credentials
mountPath: /root/.aws
volumes:
- name: config
configMap:
Expand All @@ -139,6 +131,9 @@ spec:
- name: varlibdockercontainers
hostPath:
path: /var/lib/docker/containers
- name: telemetry-aws-credentials
secret:
secretName: spot-bigdata-telemetry-creds
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
Expand Down
2 changes: 1 addition & 1 deletion charts/spark-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: Spark Operator (b/g part)
name: spark-operator
version: 0.1.22
version: 0.1.23
appVersion: v1beta2-1.3.4-3.1.1
dependencies:
- name: spark-operator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,6 @@ spec:
containerPort: 2020
protocol: TCP
env:
- name: AWS_ACCESS_KEY_ID
valueFrom:
secretKeyRef:
name: spot-bigdata-telemetry-creds
key: AWS_ACCESS_KEY_ID
- name: AWS_SECRET_ACCESS_KEY
valueFrom:
secretKeyRef:
name: spot-bigdata-telemetry-creds
key: AWS_SECRET_ACCESS_KEY
- name: AWS_BUCKET_NAME
valueFrom:
secretKeyRef:
Expand Down Expand Up @@ -183,6 +173,8 @@ spec:
- name: varlibdockercontainers
readOnly: true
mountPath: /var/lib/docker/containers
- name: telemetry-aws-credentials
mountPath: /root/.aws
{{- end }}
{{- if or .Values.webhook.enable (ne (len .Values.volumes) 0) .Values.telemetry.enabled }}
volumes:
Expand All @@ -199,6 +191,9 @@ spec:
- name: config
configMap:
name: bigdata-telemetry-fluentbit-cm
- name: telemetry-aws-credentials
secret:
secretName: spot-bigdata-telemetry-creds
- name: varlog
hostPath:
path: /var/log/
Expand Down
Loading