Merge pull request #31 from opendatadiscovery/feature/rollback_odd_co…

…llector_to_work_without_parameter_store Rollback version of odd-collector.
opendatadiscovery · Dec 16, 2023 · 36e0617 · 36e0617
2 parents 05a68a2 + 1afff11
commit 36e0617
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 57 deletions.
diff --git a/charts/odd-collector/templates/_helpers.tpl b/charts/odd-collector/templates/_helpers.tpl
@@ -50,14 +50,3 @@ Selector labels
 app.kubernetes.io/name: {{ include "odd-collector.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "odd-collector.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "odd-collector.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
diff --git a/charts/odd-collector/templates/deployment.yaml b/charts/odd-collector/templates/deployment.yaml
@@ -24,7 +24,6 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "odd-collector.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:

diff --git a/charts/odd-collector/templates/service.yaml b/charts/odd-collector/templates/service.yaml
diff --git a/charts/odd-collector/templates/serviceaccount.yaml b/charts/odd-collector/templates/serviceaccount.yaml
diff --git a/charts/odd-collector/values.yaml b/charts/odd-collector/values.yaml
@@ -14,19 +14,6 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
-service:
-  annotations: {"eks.amazonaws.com/role-arn": "arn:aws:iam::${ACCOUNT_ID}:role/aws-service-role/ssm.amazonaws.com/AWSServiceRoleForAmazonSSM"}
-  port: 80
-
 podAnnotations: {}
 
 podSecurityContext:

diff --git a/cloudformation/collector-values.yaml b/cloudformation/collector-values.yaml
@@ -62,8 +62,6 @@ tolerations: []
 affinity: {}
 
 collectorConfig: |
-  secrets_backend:
-    provider: "AWSSystemsManagerParameterStore"
   default_pulling_interval: 10
   token: "odd-token"
   platform_host_url: "http://odd-platform"