Remove awsRole from helm charts

bakdata · May 13, 2024 · f773a80 · f773a80
1 parent e08ca2e
commit f773a80
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 33 deletions.
diff --git a/charts/producer-app-cleanup-job/templates/job.yaml b/charts/producer-app-cleanup-job/templates/job.yaml
@@ -21,11 +21,8 @@ spec:
   ttlSecondsAfterFinished: 30
   template:
     metadata:
-    {{- if or .Values.awsRole .Values.podAnnotations }}
+    {{- if .Values.podAnnotations }}
       annotations:
-      {{- if .Values.awsRole }}
-        iam.amazonaws.com/role: {{ .Values.awsRole }}
-      {{- end }}
       {{- range $key, $value := .Values.podAnnotations }}
         {{ $key | quote }}: {{ $value | quote }}
       {{- end }}

diff --git a/charts/producer-app-cleanup-job/values.yaml b/charts/producer-app-cleanup-job/values.yaml
@@ -10,8 +10,6 @@ restartPolicy: OnFailure
 
 configurationEnvPrefix: "APP"
 
-# awsRole: my-aws-role
-
 streams:
 #  brokers: "test:9092"
 #  schemaRegistryUrl: "url:1234"

diff --git a/charts/producer-app/README.md b/charts/producer-app/README.md
@@ -64,7 +64,6 @@ Alternatively, a YAML file that specifies the values for the parameters can be p
 | `env`                    | Custom environment variables                                                                                                                                                                                                                                                                                                      | `{}`    |
 | `secrets`                | Custom secret environment variables. Prefix with `configurationEnvPrefix` in order to pass secrets to command line or prefix with `STREAMS_` to pass secrets to Kafka Streams configuration. E.g., `APP_MY_PARAM` would be passed as `--my-param` and `STREAMS_MAX_POLL_TIMEOUT_MS` would be translated to `max.poll.timeout.ms`. | `{}`    |
 | `secretRefs`             | Inject existing secrets as environment variables. Map key is used as environment variable name. Value consists of secret `name` and `key`.                                                                                                                                                                                        | `{}`    |
-| `awsRole`                | AWS Role that is annotated to the pod in order to authorize AWS resources using [kube2iam](https://github.com/jtblin/kube2iam).                                                                                                                                                                                                   |         |
 
 ### JVM
 

diff --git a/charts/producer-app/templates/pod.yaml b/charts/producer-app/templates/pod.yaml
@@ -1,11 +1,8 @@
 {{- define "producer-app.podTemplate" -}}
 {{- $root := . -}}
 metadata:
-{{- if or .Values.awsRole .Values.podAnnotations }}
+{{- if .Values.podAnnotations }}
   annotations:
-  {{- if .Values.awsRole }}
-    iam.amazonaws.com/role: {{ .Values.awsRole }}
-  {{- end }}
   {{- range $key, $value := .Values.podAnnotations }}
     {{ $key | quote }}: {{ $value | quote }}
   {{- end }}

diff --git a/charts/producer-app/values.yaml b/charts/producer-app/values.yaml
@@ -15,8 +15,6 @@ restartPolicy: OnFailure
 
 configurationEnvPrefix: "APP"
 
-# awsRole: my-aws-role
-
 # Optional: Cron schedule for this producer job
 # schedule: "0 12 * * *"
 

diff --git a/charts/rclone-copy/templates/rclone-cron.yaml b/charts/rclone-copy/templates/rclone-cron.yaml
@@ -29,11 +29,8 @@ spec:
     spec:
       template:
         metadata:
-        {{- if or .Values.awsRole .Values.podAnnotations }}
+        {{- if .Values.podAnnotations }}
           annotations:
-          {{- if .Values.awsRole }}
-            iam.amazonaws.com/role: {{ .Values.awsRole }}
-          {{- end }}
           {{- range $key, $value := .Values.podAnnotations }}
             {{ $key | quote }}: {{ $value | quote }}
           {{- end }}

diff --git a/charts/rclone-copy/values.yaml b/charts/rclone-copy/values.yaml
@@ -40,9 +40,6 @@ suspend: false
 # Content of the rclone.conf file.
 rcloneConf: ""
 
-# AWS Role to be used in this Docker image.
-awsRole: ""
-
 # Release version for the openbridge/ob_bulkstash docker image.
 # You probably don't need to change this.
 imageRelease: 1.53.1

diff --git a/charts/streams-app-cleanup-job/templates/job.yaml b/charts/streams-app-cleanup-job/templates/job.yaml
@@ -21,11 +21,8 @@ spec:
   ttlSecondsAfterFinished: 30
   template:
     metadata:
-    {{- if or .Values.awsRole .Values.podAnnotations }}
+    {{- if .Values.podAnnotations }}
       annotations:
-      {{- if .Values.awsRole }}
-        iam.amazonaws.com/role: {{ .Values.awsRole }}
-      {{- end }}
       {{- range $key, $value := .Values.podAnnotations }}
         {{ $key | quote }}: {{ $value | quote }}
       {{- end }}

diff --git a/charts/streams-app-cleanup-job/values.yaml b/charts/streams-app-cleanup-job/values.yaml
@@ -10,8 +10,6 @@ restartPolicy: OnFailure
 
 configurationEnvPrefix: "APP"
 
-# awsRole: my-aws-role
-
 streams:
 #  brokers: "test:9092"
 #  schemaRegistryUrl: "url:1234"

diff --git a/charts/streams-app/README.md b/charts/streams-app/README.md
@@ -77,7 +77,6 @@ Alternatively, a YAML file that specifies the values for the parameters can be p
 | `env`                    | Custom environment variables                                                                                                                                                                                                                                                                                                      | `{}`    |
 | `secrets`                | Custom secret environment variables. Prefix with `configurationEnvPrefix` in order to pass secrets to command line or prefix with `STREAMS_` to pass secrets to Kafka Streams configuration. E.g., `APP_MY_PARAM` would be passed as `--my-param` and `STREAMS_MAX_POLL_TIMEOUT_MS` would be translated to `max.poll.timeout.ms`. | `{}`    |
 | `secretRefs`             | Inject existing secrets as environment variables. Map key is used as environment variable name. Value consists of secret `name` and `key`.                                                                                                                                                                                        | `{}`    |
-| `awsRole`                | AWS Role that is annotated to the pod in order to authorize AWS resources using [kube2iam](https://github.com/jtblin/kube2iam).                                                                                                                                                                                                   |         |
 | `log4jConfig`            | Log4J 2 XML configuration file that can be used for log configuration. Use with `--set-file`.                                                                                                                                                                                                                                     |         |
 
 ### JMX Configuration

diff --git a/charts/streams-app/templates/deployment.yaml b/charts/streams-app/templates/deployment.yaml
@@ -39,11 +39,8 @@ spec:
       release: {{ .Release.Name }}
   template:
     metadata:
-    {{- if or .Values.awsRole .Values.prometheus.jmx.enabled .Values.podAnnotations }}
+    {{- if or .Values.prometheus.jmx.enabled .Values.podAnnotations }}
       annotations:
-      {{- if .Values.awsRole }}
-        iam.amazonaws.com/role: {{ .Values.awsRole }}
-      {{- end }}
       {{- if .Values.prometheus.jmx.enabled }}
         prometheus.io/scrape: "true"
         prometheus.io/port: {{ .Values.prometheus.jmx.port | quote }}

diff --git a/charts/streams-app/values.yaml b/charts/streams-app/values.yaml
@@ -10,8 +10,6 @@ imagePullSecrets: []
 
 configurationEnvPrefix: "APP"
 
-# awsRole: my-aws-role
-
 # log4jConfig:
 
 resources: