Merge pull request #34 from cybertec-postgresql/cronjob_fix

Cronjob fix

Author: Schmaetz

charts/postgres-operator-ui/values.yaml

@@ -43,7 +43,7 @@ envs:
   # UI and operator API. Insert the service name of the operator API here!
   appUrl: "http://localhost:8081"
   operatorApiUrl: "http://postgres-operator:8080"
-  operatorClusterNameLabel: "cluster-name"
+  operatorClusterNameLabel: "cluster.cpo.opensource.cybertec.at/name"
   resourcesVisible: "False"
   targetNamespace: "default"
   teams:

charts/postgres-operator/crds/operatorconfigurations.yaml

@@ -68,7 +68,7 @@ spec:
                   type: string
               docker_image:
                 type: string
-                default: "ghcr.io/zalando/spilo-15:3.0-p1"
+                default: "docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-1"
               enable_crd_registration:
                 type: boolean
                 default: true
@@ -151,7 +151,7 @@ spec:
                     default: 180
                   replication_username:
                      type: string
-                     default: standby
+                     default: cpo_replication
                   super_username:
                      type: string
                      default: postgres
@@ -186,10 +186,10 @@ spec:
                     additionalProperties:
                       type: string
                     default:
-                      application: spilo
+                      application: cpo
                   cluster_name_label:
                     type: string
-                    default: "cluster-name"
+                    default: "cluster.cpo.opensource.cybertec.at/name"
                   custom_pod_annotations:
                     type: object
                     additionalProperties:
@@ -311,13 +311,13 @@ spec:
                     type: string
                   pod_role_label:
                     type: string
-                    default: "spilo-role"
+                    default: "member.cpo.opensource.cybertec.at/role"
                   pod_service_account_definition:
                     type: string
                     default: ""
                   pod_service_account_name:
                     type: string
-                    default: "postgres-pod"
+                    default: "cpo-pod"
                   pod_service_account_role_binding_definition:
                     type: string
                     default: ""
@@ -574,7 +574,7 @@ spec:
                     default: "https://info.example.com/oauth2/tokeninfo?access_token= uid realm=/employees"
                   pam_role_name:
                     type: string
-                    default: "zalandos"
+                    default: "cpo_pam"
                   postgres_superuser_teams:
                     type: array
                     items:

charts/postgres-operator/values.yaml

@@ -102,9 +102,9 @@ configKubernetes:
   cluster_domain: cluster.local
   # additional labels assigned to the cluster objects
   cluster_labels:
-    application: spilo
+    application: cpo
   # label assigned to Kubernetes objects created by the operator
-  cluster_name_label: cluster-name
+  cluster_name_label: cluster.cpo.opensource.cybertec.at/name
   # additional annotations to add to every database pod
   # custom_pod_annotations:
   #   keya: valuea
@@ -181,7 +181,7 @@ configKubernetes:
   # specify the pod management policy of stateful sets of Postgres clusters
   pod_management_policy: "ordered_ready"
   # label assigned to the Postgres pods (and services/endpoints)
-  pod_role_label: spilo-role
+  pod_role_label: member.cpo.opensource.cybertec.at/role
   # service account definition as JSON/YAML string to be used by postgres cluster pods
   # pod_service_account_definition: ""
 

docker/logical-backup/dump.sh

@@ -158,15 +158,15 @@ declare -a search_strategy=(
 )
 
 function list_all_replica_pods_current_node {
-    get_pods "labelSelector=${CLUSTER_NAME_LABEL}%3D${SCOPE},spilo-role%3Dreplica&fieldSelector=spec.nodeName%3D${CURRENT_NODENAME}" | tee | head -n 1
+    get_pods "labelSelector=${CLUSTER_NAME_LABEL}%3D${SCOPE},member.cpo.opensource.cybertec.at/role%3Dreplica&fieldSelector=spec.nodeName%3D${CURRENT_NODENAME}" | tee | head -n 1
 }
 
 function list_all_replica_pods_any_node {
-    get_pods "labelSelector=${CLUSTER_NAME_LABEL}%3D${SCOPE},spilo-role%3Dreplica" | tee | head -n 1
+    get_pods "labelSelector=${CLUSTER_NAME_LABEL}%3D${SCOPE},member.cpo.opensource.cybertec.at/role%3Dreplica" | tee | head -n 1
 }
 
 function get_master_pod {
-    get_pods "labelSelector=${CLUSTER_NAME_LABEL}%3D${SCOPE},spilo-role%3Dmaster" | tee | head -n 1
+    get_pods "labelSelector=${CLUSTER_NAME_LABEL}%3D${SCOPE},member.cpo.opensource.cybertec.at/role%3Dmaster" | tee | head -n 1
 }
 
 CURRENT_NODENAME=$(get_current_pod | jq .items[].spec.nodeName --raw-output)

docs/diagrams/neutral_operator.excalidraw

@@ -367,7 +367,7 @@
       "version": 166,
       "versionNonce": 1814670812,
       "isDeleted": false,
-      "text": "spilo-role=master",
+      "text": "member.cpo.opensource.cybertec.at/role=master",
       "fontSize": 20,
       "fontFamily": 1,
       "textAlign": "left",
@@ -393,7 +393,7 @@
       "version": 245,
       "versionNonce": 116764132,
       "isDeleted": false,
-      "text": "spilo-role=replica",
+      "text": "member.cpo.opensource.cybertec.at/role=replica",
       "fontSize": 20,
       "fontFamily": 1,
       "textAlign": "left",
@@ -471,7 +471,7 @@
       "version": 314,
       "versionNonce": 411363036,
       "isDeleted": false,
-      "text": "spilo-role=replica",
+      "text": "member.cpo.opensource.cybertec.at/role=replica",
       "fontSize": 20,
       "fontFamily": 1,
       "textAlign": "left",
@@ -2039,7 +2039,7 @@
       "version": 331,
       "versionNonce": 1673009380,
       "isDeleted": false,
-      "text": "spilo-role=master",
+      "text": "member.cpo.opensource.cybertec.at/role=master",
       "fontSize": 20,
       "fontFamily": 1,
       "textAlign": "left",
@@ -2887,7 +2887,7 @@
       "version": 374,
       "versionNonce": 349956068,
       "isDeleted": false,
-      "text": "spilo-role=replica",
+      "text": "member.cpo.opensource.cybertec.at/role=replica",
       "fontSize": 20,
       "fontFamily": 1,
       "textAlign": "left",
@@ -3071,7 +3071,7 @@
       "version": 456,
       "versionNonce": 241829340,
       "isDeleted": false,
-      "text": "spilo-role=master",
+      "text": "member.cpo.opensource.cybertec.at/role=master",
       "fontSize": 20,
       "fontFamily": 1,
       "textAlign": "left",

docs/quickstart.md

@@ -184,18 +184,18 @@ are named like the cluster. The database pods can be identified by their number
 suffix, starting from `-0`. They run the [Spilo](https://github.com/zalando/spilo)
 container image by Zalando. As for the services and endpoints, there will be one
 for the master pod and another one for all the replicas (`-repl` suffix). Check
-if all components are coming up. Use the label `application=spilo` to filter and
-list the label `spilo-role` to see who is currently the master.
+if all components are coming up. Use the label `application=cpo` to filter and
+list the label `member.cpo.opensource.cybertec.at/role` to see who is currently the master.
 
 ```bash
 # check the deployed cluster
 kubectl get postgresql
 
 # check created database pods
-kubectl get pods -l application=spilo -L spilo-role
+kubectl get pods -l application=cpo -L member.cpo.opensource.cybertec.at/role
 
 # check created service resources
-kubectl get svc -l application=spilo -L spilo-role
+kubectl get svc -l application=cpo -L member.cpo.opensource.cybertec.at/role
 ```
 
 ## Connect to the Postgres cluster via psql

docs/reference/operator_parameters.md

@@ -387,11 +387,11 @@ configuration they are grouped under the `kubernetes` key.
 
 * **pod_role_label**
   name of the label assigned to the Postgres pods (and services/endpoints) by
-  the operator. The default is `spilo-role`.
+  the operator. The default is `member.cpo.opensource.cybertec.at/role`.
 
 * **cluster_labels**
   list of `name:value` pairs for additional labels assigned to the cluster
-  objects. The default is `application:spilo`.
+  objects. The default is `application:cpo`.
 
 * **inherited_labels**
   list of label keys that can be inherited from the cluster manifest, and
@@ -404,7 +404,7 @@ configuration they are grouped under the `kubernetes` key.
 * **cluster_name_label**
   name of the label assigned to Kubernetes objects created by the operator
   that indicates which cluster a given object belongs to. The default is
-  `cluster-name`.
+  `cluster.cpo.opensource.cybertec.at/name`.
 
 * **node_readiness_label**
   a set of labels that a running and active node should possess to be

docs/user.md

@@ -54,12 +54,12 @@ cluster name length is 53 characters.
 
 ## Watch pods being created
 
-Check if the database pods are coming up. Use the label `application=spilo` to
-filter and list the label `spilo-role` to see when the master is promoted and
+Check if the database pods are coming up. Use the label `application=cpo` to
+filter and list the label `member.cpo.opensource.cybertec.at/role` to see when the master is promoted and
 replicas get their labels.
 
 ```bash
-kubectl get pods -l application=spilo -L spilo-role -w
+kubectl get pods -l application=cpo -L member.cpo.opensource.cybertec.at/role -w
 ```
 
 The operator also emits K8s events to the Postgresql CRD which can be inspected
@@ -77,7 +77,7 @@ the master pod of our test cluster.
 
 ```bash
 # get name of master pod of acid-minimal-cluster
-export PGMASTER=$(kubectl get pods -o jsonpath={.items..metadata.name} -l application=spilo,cluster-name=acid-minimal-cluster,spilo-role=master -n default)
+export PGMASTER=$(kubectl get pods -o jsonpath={.items..metadata.name} -l application=cpo,cluster.cpo.opensource.cybertec.at/name=acid-minimal-cluster,member.cpo.opensource.cybertec.at/role=master -n default)
 
 # set up port forward
 kubectl port-forward $PGMASTER 6432:5432 -n default

e2e/scripts/cleanup.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 kubectl delete postgresql acid-minimal-cluster
-kubectl delete deployments -l application=db-connection-pooler,cluster-name=acid-minimal-cluster
-kubectl delete statefulsets -l application=spilo,cluster-name=acid-minimal-cluster
-kubectl delete services -l application=spilo,cluster-name=acid-minimal-cluster
+kubectl delete deployments -l application=db-connection-pooler,cluster.cpo.opensource.cybertec.at/name=acid-minimal-cluster
+kubectl delete statefulsets -l application=cpo,cluster.cpo.opensource.cybertec.at/name=acid-minimal-cluster
+kubectl delete services -l application=cpo,cluster.cpo.opensource.cybertec.at/name=acid-minimal-cluster
 kubectl delete configmap postgres-operator
 kubectl delete deployment postgres-operator

e2e/scripts/watch_objects.sh

@@ -8,7 +8,7 @@ kubectl get pods -o jsonpath='{.items[].metadata.annotations.zalando-postgres-op
 echo
 echo
 echo 'Pods'
-kubectl get pods -l application=spilo -o wide --all-namespaces
+kubectl get pods -l application=cpo -o wide --all-namespaces
 echo
 kubectl get pods -l application=db-connection-pooler -o wide --all-namespaces
 echo
@@ -25,7 +25,7 @@ kubectl get pods -l name=postgres-operator -o jsonpath='{.items..metadata.annota
 echo
 echo
 echo 'Spilo Image in statefulset'
-kubectl get pods -l application=spilo -o jsonpath='{.items..spec.containers..image}'
+kubectl get pods -l application=cpo -o jsonpath='{.items..spec.containers..image}'
 echo
 echo
 echo 'Queue Status'