From dee968ce1e3c16fa49fe810fae21b26713f00d4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnar=20P=C3=A1ll?= Date: Wed, 30 Aug 2023 14:54:52 +0000 Subject: [PATCH] Adding support http proxy support --- charts/bigdata-notebook-service/Chart.yaml | 2 +- .../templates/deployment.yaml | 24 +++++++++++++++++++ charts/bigdata-operator/Chart.yaml | 4 ++-- .../templates/deployment.yaml | 24 +++++++++++++++++++ charts/bigdata-spark-watcher/Chart.yaml | 2 +- .../templates/deployment.yaml | 24 +++++++++++++++++++ charts/bigdata-telemetry/Chart.yaml | 2 +- .../thanos-receiver-statefulset.yaml | 12 ++++++++++ 8 files changed, 89 insertions(+), 5 deletions(-) diff --git a/charts/bigdata-notebook-service/Chart.yaml b/charts/bigdata-notebook-service/Chart.yaml index 174ecbc8..3ee4ef09 100644 --- a/charts/bigdata-notebook-service/Chart.yaml +++ b/charts/bigdata-notebook-service/Chart.yaml @@ -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.1.30 +version: 0.2.0 appVersion: 0.1.16 home: https://github.com/spotinst/charts icon: https://docs.spot.io/_media/images/spot_mark.png diff --git a/charts/bigdata-notebook-service/templates/deployment.yaml b/charts/bigdata-notebook-service/templates/deployment.yaml index 8cd414a2..5745b670 100644 --- a/charts/bigdata-notebook-service/templates/deployment.yaml +++ b/charts/bigdata-notebook-service/templates/deployment.yaml @@ -110,6 +110,18 @@ spec: configMapKeyRef: name: spot-ofas-cluster-info key: accountId + - name: HTTP_PROXY + valueFrom: + configMapKeyRef: + name: spot-ofas-cluster-info + key: proxyUrl + optional: true + - name: HTTPS_PROXY + valueFrom: + configMapKeyRef: + name: spot-ofas-cluster-info + key: proxyUrl + optional: true resources: {{- toYaml .Values.resources | nindent 12 }} {{- if .Values.telemetry.enabled }} @@ -150,6 +162,18 @@ spec: configMapKeyRef: name: spot-ofas-cluster-info key: accountId + - name: HTTP_PROXY + valueFrom: + configMapKeyRef: + name: spot-ofas-cluster-info + key: proxyUrl + optional: true + - name: HTTPS_PROXY + valueFrom: + configMapKeyRef: + name: spot-ofas-cluster-info + key: proxyUrl + optional: true resources: {} volumeMounts: - name: config diff --git a/charts/bigdata-operator/Chart.yaml b/charts/bigdata-operator/Chart.yaml index c1cfa4c3..d02ff9d8 100644 --- a/charts/bigdata-operator/Chart.yaml +++ b/charts/bigdata-operator/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: bigdata-operator description: Spot Ocean BigData Operator type: application -version: 0.3.1 -appVersion: 0.3.0 +version: 0.4.0 +appVersion: 0.4.0 home: https://github.com/spotinst/charts icon: https://docs.spot.io/_media/images/spot_mark.png sources: diff --git a/charts/bigdata-operator/templates/deployment.yaml b/charts/bigdata-operator/templates/deployment.yaml index 9d45eff6..c85ed2ff 100644 --- a/charts/bigdata-operator/templates/deployment.yaml +++ b/charts/bigdata-operator/templates/deployment.yaml @@ -52,6 +52,18 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: HTTP_PROXY + valueFrom: + configMapKeyRef: + name: spot-ofas-cluster-info + key: proxyUrl + optional: true + - name: HTTPS_PROXY + valueFrom: + configMapKeyRef: + name: spot-ofas-cluster-info + key: proxyUrl + optional: true resources: {{- toYaml .Values.resources | nindent 12 }} {{- if .Values.telemetry.enabled }} @@ -100,6 +112,18 @@ spec: configMapKeyRef: name: spot-ofas-cluster-info key: accountId + - name: HTTP_PROXY + valueFrom: + configMapKeyRef: + name: spot-ofas-cluster-info + key: proxyUrl + optional: true + - name: HTTPS_PROXY + valueFrom: + configMapKeyRef: + name: spot-ofas-cluster-info + key: proxyUrl + optional: true resources: {} volumeMounts: - name: config diff --git a/charts/bigdata-spark-watcher/Chart.yaml b/charts/bigdata-spark-watcher/Chart.yaml index 4a8d29ca..48e5cc6a 100644 --- a/charts/bigdata-spark-watcher/Chart.yaml +++ b/charts/bigdata-spark-watcher/Chart.yaml @@ -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.4.3 +version: 0.5.3 appVersion: 0.4.2 home: https://github.com/spotinst/charts icon: https://docs.spot.io/_media/images/spot_mark.png diff --git a/charts/bigdata-spark-watcher/templates/deployment.yaml b/charts/bigdata-spark-watcher/templates/deployment.yaml index a995d5b9..8b3fa8ef 100644 --- a/charts/bigdata-spark-watcher/templates/deployment.yaml +++ b/charts/bigdata-spark-watcher/templates/deployment.yaml @@ -54,6 +54,18 @@ spec: env: {{- toYaml . | nindent 12 }} {{- end }} + - name: HTTP_PROXY + valueFrom: + configMapKeyRef: + name: spot-ofas-cluster-info + key: proxyUrl + optional: true + - name: HTTPS_PROXY + valueFrom: + configMapKeyRef: + name: spot-ofas-cluster-info + key: proxyUrl + optional: true resources: {{- toYaml .Values.resources | nindent 12 }} {{- if .Values.telemetry.enabled }} @@ -94,6 +106,18 @@ spec: configMapKeyRef: name: spot-ofas-cluster-info key: accountId + - name: HTTP_PROXY + valueFrom: + configMapKeyRef: + name: spot-ofas-cluster-info + key: proxyUrl + optional: true + - name: HTTPS_PROXY + valueFrom: + configMapKeyRef: + name: spot-ofas-cluster-info + key: proxyUrl + optional: true resources: {} volumeMounts: - name: config diff --git a/charts/bigdata-telemetry/Chart.yaml b/charts/bigdata-telemetry/Chart.yaml index c585a058..01c2ffc2 100644 --- a/charts/bigdata-telemetry/Chart.yaml +++ b/charts/bigdata-telemetry/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: bigdata-telemetry description: A Helm chart for the Spot Big Data Telemetry components type: application -version: 0.1.1 +version: 0.2.0 appVersion: "1.16.0" home: https://github.com/spotinst/charts icon: https://docs.spot.io/_media/images/spot_mark.png diff --git a/charts/bigdata-telemetry/templates/thanos-receiver-statefulset.yaml b/charts/bigdata-telemetry/templates/thanos-receiver-statefulset.yaml index dec3f7b8..8c5861e7 100644 --- a/charts/bigdata-telemetry/templates/thanos-receiver-statefulset.yaml +++ b/charts/bigdata-telemetry/templates/thanos-receiver-statefulset.yaml @@ -55,6 +55,18 @@ spec: name: spot-bigdata-telemetry-creds key: object-store.yaml name: bigdata-telemetry-object-store + - name: HTTP_PROXY + valueFrom: + configMapKeyRef: + name: spot-ofas-cluster-info + key: proxyUrl + optional: true + - name: HTTPS_PROXY + valueFrom: + configMapKeyRef: + name: spot-ofas-cluster-info + key: proxyUrl + optional: true image: "{{ .Values.thanos.image.repository }}:{{ .Values.thanos.image.tag }}" livenessProbe: failureThreshold: 8