From 1afff118e965dafe3156c6a598ce07af2ca9dc5b Mon Sep 17 00:00:00 2001
From: Raman Damayeu <rdamayeu@provectus.com>
Date: Sat, 16 Dec 2023 10:45:52 +0100
Subject: [PATCH] Rollback version of odd-collector to the state where SSM
 Parameter Store is not used as an alternative secrets store.

---
 charts/odd-collector/templates/_helpers.tpl    | 11 -----------
 charts/odd-collector/templates/deployment.yaml |  1 -
 charts/odd-collector/templates/service.yaml    | 18 ------------------
 .../templates/serviceaccount.yaml              | 12 ------------
 charts/odd-collector/values.yaml               | 13 -------------
 cloudformation/collector-values.yaml           |  2 --
 6 files changed, 57 deletions(-)
 delete mode 100644 charts/odd-collector/templates/service.yaml
 delete mode 100644 charts/odd-collector/templates/serviceaccount.yaml

diff --git a/charts/odd-collector/templates/_helpers.tpl b/charts/odd-collector/templates/_helpers.tpl
index 84453e2..118ef78 100644
--- 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
index 51094e2..a1422f5 100644
--- 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
deleted file mode 100644
index bec28e2..0000000
--- a/charts/odd-collector/templates/service.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "odd-collector.fullname" . }}
-  {{- with .Values.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 6 }}
-  {{- end }}
-  labels:
-    {{- include "odd-collector.labels" . | nindent 4 }}
-spec:
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    {{- include "odd-collector.selectorLabels" . | nindent 4 }}
diff --git a/charts/odd-collector/templates/serviceaccount.yaml b/charts/odd-collector/templates/serviceaccount.yaml
deleted file mode 100644
index c1a00ff..0000000
--- a/charts/odd-collector/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "odd-collector.serviceAccountName" . }}
-  labels:
-    {{- include "odd-collector.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/charts/odd-collector/values.yaml b/charts/odd-collector/values.yaml
index 073ef2d..77c52f0 100644
--- 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
index cf6b90f..3933418 100644
--- 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"