secret correction

README.md

@@ -12,10 +12,12 @@ Navigate to <http://pgadmin.local>
 
 ```bash
 # first time set the secrets flag
-helm install postgres ./postgres --set secrets=true
+helm install postgres ./postgres --set secret=true
 
 # To redeploy or upgrade
 helm upgrade postgres ./postgres
+
+# After uninstall secrets and pvc are not removed, reinstall without the --set secrets=true to use the old secret
 ```
 
 ### Get Password
@@ -31,7 +33,7 @@ echo $(kubectl get secret postgres --output=jsonpath='{.data.POSTGRES_PASSWORD}'
 ```bash
 prefix=<custom prefix>
 # first time set the secrets flag
-helm template pgadmin ./pgadmin --set host=$prefix"pgadmin.apps.aws.e1.nwie.net" --set secrets=true | kubectl apply -f -
+helm template pgadmin ./pgadmin --set host=$prefix"pgadmin.apps.aws.e1.nwie.net" --set secret=true | kubectl apply -f -
 
 # To redeploy or upgrade
 helm template pgadmin ./pgadmin --set host=$prefix"pgadmin.apps.aws.e1.nwie.net" | kubectl apply -f -

pgadmin/templates/deploy.yaml

@@ -25,7 +25,7 @@ spec:
               cpu: "1"
             requests:
               memory: "1Mi"
-              cpu: "1m"
+              cpu: "100m"
           volumeMounts:
           - name: data
             mountPath: /var/lib/pgadmin

pgadmin/templates/ingress.yaml

@@ -1,17 +1,39 @@
-apiVersion: extensions/v1beta1
-kind: Ingress
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
 metadata:
-  name: {{ .Release.Name }}
+  name:  {{ .Release.Name }}-internal-tls
   annotations:
-    kubernetes.io/ingress.class: default
+    kubernetes.io/ingress.class: traefik-internal
 spec:
+  entryPoints:
+    - websecure
   tls:
-    - hosts:
-      - {{ required "A valid .Values.host entry required!" .Values.host }}
-  rules:
-  - host: {{ required "A valid .Values.host entry required!" .Values.host }}
-    http:
-      paths:
-      - backend:
-          serviceName: {{ .Release.Name }}
-          servicePort: 80
+    certResolver: myresolver
+    domains:
+    - main: "*.ducoterra.net"
+  routes:
+  - match: Host(`{{ .Release.Name }}.ducoterra.net`)
+    kind: Rule
+    services:
+    - name:  {{ .Release.Name }}
+      port: 80
+
+---
+
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name:  {{ .Release.Name }}-internal-web
+  annotations:
+    kubernetes.io/ingress.class: traefik-internal
+spec:
+  entryPoints:
+    - web
+  routes:
+  - match: Host(`{{ .Release.Name }}.ducoterra.net`)
+    kind: Rule
+    services:
+    - name:  {{ .Release.Name }}
+      port: 80
+    middlewares:
+      - name: httpsredirect

pgadmin/templates/pvc.yaml

@@ -1,11 +1,15 @@
+{{ if .Release.IsInstall }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ .Release.Name }}
+  annotations:
+    "helm.sh/resource-policy": keep
 spec:
-  storageClassName: efs-gp
+  storageClassName: nfs-encrypted
   accessModes:
     - ReadWriteMany
   resources:
     requests:
-      storage: 64Gi
+      storage: 8Gi
+{{ end }}

pgadmin/templates/secret.yaml

@@ -1,8 +1,10 @@
-{{ if .Values.secrets }}
+{{ if and .Values.secret .Release.IsInstall }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: pgadmin
+  name: {{ .Release.Name }}
+  annotations:
+    "helm.sh/resource-policy": keep
 type: generic
 data:
   PGADMIN_DEFAULT_EMAIL: {{ "postgres" | b64enc | quote }}

postgres/templates/deploy.yaml

@@ -25,7 +25,7 @@ spec:
               cpu: "4"
             requests:
               memory: "1Mi"
-              cpu: "1m"
+              cpu: "100m"
           volumeMounts:
           - name: data
             mountPath: /var/lib/postgresql/data 

postgres/templates/pvc.yaml

@@ -1,11 +1,15 @@
+{{ if .Release.IsInstall }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ .Release.Name }}
+  annotations:
+    "helm.sh/resource-policy": keep
 spec:
-  storageClassName: efs-gp
+  storageClassName: nfs-encrypted
   accessModes:
     - ReadWriteMany
   resources:
     requests:
       storage: 64Gi
+{{ end }}

postgres/templates/secret.yaml

@@ -1,8 +1,10 @@
-{{ if .Values.secrets }}
+{{ if and .Values.secret .Release.IsInstall }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: postgres
+  name: {{ .Release.Name }}
+  annotations:
+    "helm.sh/resource-policy": keep
 type: generic
 data:
   POSTGRES_USER: {{ "postgres" | b64enc | quote }}

postgres/values.yaml

@@ -1,2 +1,2 @@
 image: postgres
-tag: 12.3-alpine
+tag: latest