Replaced gcp config with new env, secret & configmap in subscription

.editorconfig

@@ -0,0 +1,32 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
+
+# YAML files (Helm charts)
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2
+
+# Helm template files
+[*.{tpl,tmpl,gotmpl}]
+indent_style = space
+indent_size = 2
+
+# Markdown files
+[*.md]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = false
+
+# Helm ignore file
+[.helmignore]
+indent_style = space
+indent_size = 2

.gitattributes

@@ -0,0 +1,12 @@
+# Set default behavior to automatically normalize line endings to LF
+* text=auto eol=lf
+
+# Ensure all text files use LF
+*.yml text eol=lf
+*.yaml text eol=lf
+*.md text eol=lf
+*.txt text eol=lf
+*.sh text eol=lf
+.gitignore text eol=lf
+.gitattributes text eol=lf
+.editorconfig text eol=lf

charts/api-subscription/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/api-subscription/templates/subscription.yaml

@@ -6,7 +6,6 @@ spec:
   imageRepository: {{.Values.image.repository | quote}}
   imageTag: {{.Values.image.tag | quote}}
   configMapName: {{ include "api-subscription.fullname" . }}
-  googleServiceAccountSecretName: {{.Values.gcp.serviceAccount | quote}}
   persistentVolumeClaimName: {{.Values.volume.data.volumeClaim | quote}}
   {{- with .Values.args }}
   preCommands:
@@ -20,3 +19,19 @@ spec:
   affinity:
     {{ toYaml . | nindent 4}}
   {{- end }}
+  {{- with .Values.env }}
+  env:
+    {{ toYaml . | nindent 4}}
+  {{- end }}
+  {{- with .Values.envFrom }}
+  envFrom:
+    {{ toYaml . | nindent 4}}
+  {{- end }}
+  {{- with .Values.secrets }}
+  secrets:
+    {{ toYaml . | nindent 4}}
+  {{- end }}
+  {{- with .Values.configMaps }}
+  configMaps:
+    {{ toYaml . | nindent 4}}
+  {{- end }}

charts/api-subscription/values.yaml

@@ -29,8 +29,43 @@ args: []
 
 config: {}
 
-gcp:
-  serviceAccount: ""
+env: []
+  # - name: MY_STATIC_VAR
+  #   value: "my_value"
+  # - name: MY_CONFIG_VAR
+  #   valueFrom:
+  #     configMapKeyRef:
+  #       name: my-configmap
+  #       key: config-key
+  #       optional: false
+  # - name: MY_SECRET_VAR
+  #   valueFrom:
+  #     secretKeyRef:
+  #       name: my-secret
+  #       key: secret-key
+  #       optional: false
+
+envFrom: []
+  # - configMapRef:
+  #     name: my-configmap
+  #     optional: false
+  # - secretRef:
+  #     name: my-secret
+  #     optional: false
+
+secrets: []
+  # - name: cert-secret
+  #   secretName: my-certificate-secret
+  #   mountPath: /etc/certs
+  #   readOnly: true
+  #   optional: false
+
+configMaps: []
+  # - name: app-config
+  #   configMapName: my-app-config
+  #   mountPath: /etc/config
+  #   readOnly: true
+  #   optional: false
 
 volume:
   data:

charts/rtf2html/templates/secret.yaml

@@ -1,16 +1,16 @@
-{{- if or .Values.serial.rtf2html .Values.serial.html2rtf -}}
-apiVersion: v1
-kind: Secret
-metadata:
-  labels:
-    {{- include "rtf2html.labels" . | nindent 4 }}
-  name: {{ include "rtf2html.fullname" . }}
-data:
-  {{- if .Values.serial.rtf2html }}
-  serial-rtf2html: {{ .Values.serial.rtf2html | b64enc | quote }}
-  {{- end }}
-  {{- if .Values.serial.html2rtf }}
-  serial-html2rtf: {{ .Values.serial.html2rtf | b64enc | quote }}
-  {{- end }}
-{{- end -}}
-
+{{- if or .Values.serial.rtf2html .Values.serial.html2rtf -}}
+apiVersion: v1
+kind: Secret
+metadata:
+  labels:
+    {{- include "rtf2html.labels" . | nindent 4 }}
+  name: {{ include "rtf2html.fullname" . }}
+data:
+  {{- if .Values.serial.rtf2html }}
+  serial-rtf2html: {{ .Values.serial.rtf2html | b64enc | quote }}
+  {{- end }}
+  {{- if .Values.serial.html2rtf }}
+  serial-html2rtf: {{ .Values.serial.html2rtf | b64enc | quote }}
+  {{- end }}
+{{- end -}}
+

charts/sensa/templates/configmap.yaml

@@ -1,8 +1,8 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "sensa.fullname" . }}
-  labels:
-{{ include "sensa.labels" . | indent 4 }}
-data:
-  config.json: {{ .Values.config | toJson | quote }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "sensa.fullname" . }}
+  labels:
+{{ include "sensa.labels" . | indent 4 }}
+data:
+  config.json: {{ .Values.config | toJson | quote }}

charts/sensa/templates/pvc.yaml

@@ -1,24 +1,24 @@
-{{- if .Values.persistence.enabled -}}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ include "sensa.fullname" . }}
-  annotations:
-  {{- with .Values.persistence.annotations  }}
-  {{ toYaml . | indent 4 }}
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "sensa.name" . }}
-    helm.sh/chart: {{ include "sensa.chart" . }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.size | quote }}
-  {{- if .Values.persistence.storageClass }}
-  storageClassName: {{ .Values.persistence.storageClass | quote }}
-  {{- end }}
-{{- end -}}
+{{- if .Values.persistence.enabled -}}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "sensa.fullname" . }}
+  annotations:
+  {{- with .Values.persistence.annotations  }}
+  {{ toYaml . | indent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ include "sensa.name" . }}
+    helm.sh/chart: {{ include "sensa.chart" . }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+spec:
+  accessModes:
+    - {{ .Values.persistence.accessMode | quote }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size | quote }}
+  {{- if .Values.persistence.storageClass }}
+  storageClassName: {{ .Values.persistence.storageClass | quote }}
+  {{- end }}
+{{- end -}}