Remove Separate PGUpgrade Installations

Major PG Upgrades is now integrated into a single postgres-operator
binary. Deployment of a separate upgrade binary is no longer needed.

Issue: [sc-16349]

Co-authored-by: Drew Sessler <[email protected]>

Author: 2 people

helm/install/templates/_helpers.tpl

@@ -11,9 +11,6 @@ Crunchy labels
 {{- define "install.clusterLabels" -}}
 postgres-operator.crunchydata.com/control-plane: {{ .Chart.Name }}
 {{- end }}
-{{- define "install.upgradeLabels" -}}
-postgres-operator.crunchydata.com/control-plane: {{ .Chart.Name }}-upgrade
-{{- end }}
 
 {{/*
 Common labels

helm/install/templates/manager-upgrade.yaml

@@ -102,6 +102,27 @@ rules:
   - list
   - patch
   - watch
+- apiGroups:
+  - postgres-operator.crunchydata.com
+  resources:
+  - pgupgrades
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - postgres-operator.crunchydata.com
+  resources:
+  - pgupgrades/finalizers
+  verbs:
+  - patch
+  - update
+- apiGroups:
+  - postgres-operator.crunchydata.com
+  resources:
+  - pgupgrades/status
+  verbs:
+  - patch
 - apiGroups:
   - postgres-operator.crunchydata.com
   resources:

helm/install/templates/role-upgrade.yaml

@@ -14,19 +14,3 @@ subjects:
 - kind: ServiceAccount
   name: {{ include "install.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: {{ include "install.roleBindingKind" . }}
-metadata:
-  name: {{ include "install.roleBindingName" . }}-upgrade
-  labels:
-    {{- include "install.labels" . | nindent 4 }}
-    {{- include "install.upgradeLabels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: {{ include "install.roleKind" . }}
-  name: {{ include "install.roleName" . }}-upgrade
-subjects:
-- kind: ServiceAccount
-  name: {{ include "install.serviceAccountName" . }}-upgrade
-  namespace: {{ .Release.Namespace }}

helm/install/templates/role.yaml

@@ -6,11 +6,3 @@ metadata:
   labels:
     {{- include "install.labels" . | nindent 4 }}
     {{- include "install.clusterLabels" . | nindent 4 }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "install.serviceAccountName" . }}-upgrade
-  labels:
-    {{- include "install.labels" . | nindent 4 }}
-    {{- include "install.upgradeLabels" . | nindent 4 }}

helm/install/templates/role_binding.yaml

@@ -1,10 +1,9 @@
 ---
-# controllerImages are used to run the PostgresCluster and PGUpgrade controllers.
+# controllerImages are used to run the PostgresCluster controllers.
 controllerImages:
-  cluster: registry.developers.crunchydata.com/crunchydata/postgres-operator:ubi8-5.3.2-0
-  upgrade: registry.developers.crunchydata.com/crunchydata/postgres-operator-upgrade:ubi8-5.3.2-0
+  cluster: registry.developers.crunchydata.com/crunchydata/postgres-operator:5.4.0-0
 
-# relatedImages are used when an image is omitted from PostgresCluster or PGUpgrade specs.
+# relatedImages are used when an image is omitted from PostgresCluster specs or PGUpgrade specs.
 relatedImages:
   postgres_15:
     image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.3-0
@@ -41,7 +40,6 @@ debug: true
 # More info: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
 imagePullSecretNames: []
 
-# Resource configuration of the PostgresCluster and PGUpgrade controllers.
+# Resource configuration of the PostgresCluster controllers.
 resources:
   controller: {}
-  upgrade: {}

helm/install/templates/service_account.yaml

@@ -3,7 +3,8 @@ namespace: postgres-operator
 commonLabels:
   app.kubernetes.io/name: pgo
   # The version below should match the version on the PostgresCluster CRD
-  app.kubernetes.io/version: 5.3.2
+  app.kubernetes.io/version: 5.3.0
+  postgres-operator.crunchydata.com/control-plane: pgo
 
 bases:
 - ../crd
@@ -13,13 +14,8 @@ bases:
 images:
 - name: postgres-operator
   newName: registry.developers.crunchydata.com/crunchydata/postgres-operator
-  newTag: ubi8-5.3.2-0
-- name: postgres-operator-upgrade
-  newName: registry.developers.crunchydata.com/crunchydata/postgres-operator-upgrade
-  newTag: ubi8-5.3.2-0
+  newTag: 5.4.0-0
 
 patchesJson6902:
 - target: { group: apps, version: v1, kind: Deployment, name: pgo }
   path: selectors.yaml
-- target: { group: apps, version: v1, kind: Deployment, name: pgo-upgrade }
-  path: selectors.yaml

helm/install/values.yaml

@@ -1,3 +1,2 @@
 resources:
 - manager.yaml
-- manager-upgrade.yaml

kustomize/install/default/kustomization.yaml

@@ -45,7 +45,9 @@ spec:
         - name: RELATED_IMAGE_PGBOUNCER
           value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.19-0"
         - name: RELATED_IMAGE_PGEXPORTER
-          value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi8-5.3.2-0"
+          value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi8-5.3.0-0"
+        - name: RELATED_IMAGE_PGUPGRADE
+          value: "registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi8-5.3.0-0"
         securityContext:
           allowPrivilegeEscalation: false
           capabilities: { drop: [ALL] }

kustomize/install/manager/kustomization.yaml

@@ -2,6 +2,3 @@ resources:
 - service_account.yaml
 - role.yaml
 - role_binding.yaml
-- service_account-upgrade.yaml
-- role-upgrade.yaml
-- role_binding-upgrade.yaml