Merge pull request #324 from lsst-it/IT-5252_cpng_clusters_fleet

(fleet/cnpg-cluster) remove yepun & bump v0.5

Author: cbarria

fleet/lib/cnpg-cluster/fleet.yaml

@@ -38,8 +38,3 @@ targetCustomizations:
     yaml:
       overlays:
         - yagan
-  - name: yepun
-    clusterName: yepun
-    yaml:
-      overlays:
-        - yepun

fleet/lib/cnpg-cluster/overlays/manke/cnpg-backup.yaml

@@ -16,6 +16,10 @@ spec:
       remoteRef:
         key: cnpg-aws-creds-manke
         property: password
+    - secretKey: AWS_ACCESS_BUCKET
+      remoteRef:
+        key: cnpg-aws-creds-manke
+        property: website
     - secretKey: PGPASSWORD
       remoteRef:
         key: cnpg-cluster-superuser-manke
@@ -36,7 +40,7 @@ spec:
           activeDeadlineSeconds: 3600
           containers:
             - name: cnpg-backup
-              image: docker.io/lsstit/cnpg-backup:0.4
+              image: docker.io/lsstit/cnpg-backup:0.5
               volumeMounts:
                 - name: ephemeral
                   mountPath: "/tmp"
@@ -47,8 +51,6 @@ spec:
               env:
                 - name: HOST
                   value: "cnpg-loadbalancer.cloudnativepg.svc.cluster.local"
-                - name: AWS_ACCESS_BUCKET
-                  value: s3://cnpg-backups-base
           volumes:
             - name: ephemeral
               ephemeral:

fleet/lib/cnpg-cluster/overlays/pillan/cnpg-backup.yaml

@@ -16,6 +16,10 @@ spec:
       remoteRef:
         key: cnpg-aws-creds-pillan
         property: password
+    - secretKey: AWS_ACCESS_BUCKET
+      remoteRef:
+        key: cnpg-aws-creds-pillan
+        property: website
     - secretKey: PGPASSWORD
       remoteRef:
         key: cnpg-cluster-superuser-pillan
@@ -36,7 +40,7 @@ spec:
           activeDeadlineSeconds: 3600
           containers:
             - name: cnpg-backup
-              image: docker.io/lsstit/cnpg-backup:0.4
+              image: docker.io/lsstit/cnpg-backup:0.5
               volumeMounts:
                 - name: ephemeral
                   mountPath: "/tmp"
@@ -47,8 +51,6 @@ spec:
               env:
                 - name: HOST
                   value: "cnpg-loadbalancer.cloudnativepg.svc.cluster.local"
-                - name: AWS_ACCESS_BUCKET
-                  value: s3://cnpg-backups
           volumes:
             - name: ephemeral
               ephemeral:

fleet/lib/cnpg-cluster/overlays/ruka/cnpg-backup.yaml

@@ -16,6 +16,10 @@ spec:
       remoteRef:
         key: cnpg-aws-creds-ruka
         property: password
+    - secretKey: AWS_ACCESS_BUCKET
+      remoteRef:
+        key: cnpg-aws-creds-ruka
+        property: website
     - secretKey: PGPASSWORD
       remoteRef:
         key: cnpg-cluster-superuser-ruka
@@ -36,7 +40,7 @@ spec:
           activeDeadlineSeconds: 3600
           containers:
             - name: cnpg-backup
-              image: docker.io/lsstit/cnpg-backup:0.4
+              image: docker.io/lsstit/cnpg-backup:0.5
               volumeMounts:
                 - name: ephemeral
                   mountPath: "/tmp"
@@ -47,8 +51,6 @@ spec:
               env:
                 - name: HOST
                   value: "cnpg-loadbalancer.cloudnativepg.svc.cluster.local"
-                - name: AWS_ACCESS_BUCKET
-                  value: s3://cnpg-backups-dev
           volumes:
             - name: ephemeral
               ephemeral:

fleet/lib/cnpg-cluster/overlays/yagan/cnpg-backup.yaml

@@ -16,6 +16,10 @@ spec:
       remoteRef:
         key: cnpg-aws-creds-yagan
         property: password
+    - secretKey: AWS_ACCESS_BUCKET
+      remoteRef:
+        key: cnpg-aws-creds-yagan
+        property: website
     - secretKey: PGPASSWORD
       remoteRef:
         key: cnpg-cluster-superuser-yagan
@@ -36,7 +40,7 @@ spec:
           activeDeadlineSeconds: 3600
           containers:
             - name: cnpg-backup
-              image: docker.io/lsstit/cnpg-backup:0.4
+              image: docker.io/lsstit/cnpg-backup:0.5
               volumeMounts:
                 - name: ephemeral
                   mountPath: "/tmp"
@@ -47,8 +51,6 @@ spec:
               env:
                 - name: HOST
                   value: "cnpg-loadbalancer.cloudnativepg.svc.cluster.local"
-                - name: AWS_ACCESS_BUCKET
-                  value: s3://cnpg-backups-summit
           volumes:
             - name: ephemeral
               ephemeral: