Merge pull request #7 from CrunchyData/main

rebase

Author: philrhurst

.github/workflows/test.yaml

@@ -143,6 +143,7 @@ jobs:
             --env 'RELATED_IMAGE_POSTGRES_17=registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-17.2-2' \
             --env 'RELATED_IMAGE_POSTGRES_17_GIS_3.4=registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-17.2-3.4-2' \
             --env 'RELATED_IMAGE_STANDALONE_PGADMIN=registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-8.14-1' \
+            --env 'RELATED_IMAGE_COLLECTOR=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.119.0' \
             --env 'PGO_FEATURE_GATES=TablespaceVolumes=true' \
             --name 'postgres-operator' ubuntu \
             postgres-operator

.golangci.yaml

@@ -114,11 +114,6 @@ issues:
       path: internal/kubernetes/discovery.go
       text: k8s.io/client-go/discovery
 
-    # PGO-2010
-    - linters: [exhaustive]
-      path: internal/controller/postgrescluster/volumes.go
-      text: 'v1.PersistentVolumeClaimConditionType: v1.PersistentVolumeClaimControllerResizeError, v1.PersistentVolumeClaimNodeResizeError$'
-
     # These value types have unmarshal methods.
     # https://github.com/raeperd/recvcheck/issues/7
     - linters: [recvcheck]

Makefile

@@ -254,16 +254,16 @@ generate-kuttl: ## Generate kuttl tests
 ##@ Generate
 
 .PHONY: check-generate
-check-generate: ## Check crd, deepcopy functions, and rbac generation
-check-generate: generate-crd
-check-generate: generate-deepcopy
-check-generate: generate-rbac
+check-generate: ## Check everything generated is also committed
+check-generate: generate
 	git diff --exit-code -- config/crd
 	git diff --exit-code -- config/rbac
+	git diff --exit-code -- internal/collector
 	git diff --exit-code -- pkg/apis
 
 .PHONY: generate
-generate: ## Generate crd, deepcopy functions, and rbac
+generate: ## Generate everything
+generate: generate-collector
 generate: generate-crd
 generate: generate-deepcopy
 generate: generate-rbac
@@ -276,6 +276,10 @@ generate-crd: tools/controller-gen
 		paths='./pkg/apis/...' \
 		output:dir='config/crd/bases' # {directory}/{group}_{plural}.yaml
 
+.PHONY: generate-collector
+generate-collector: ## Generate OTel Collector files
+	$(GO) generate ./internal/collector
+
 .PHONY: generate-deepcopy
 generate-deepcopy: ## Generate DeepCopy functions
 generate-deepcopy: tools/controller-gen
@@ -304,7 +308,7 @@ endef
 CONTROLLER ?= hack/tools/controller-gen
 tools: tools/controller-gen
 tools/controller-gen:
-	$(call go-get-tool,$(CONTROLLER),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.5)
+	$(call go-get-tool,$(CONTROLLER),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.2)
 
 ENVTEST ?= hack/tools/setup-envtest
 tools: tools/setup-envtest

config/crd/bases/postgres-operator.crunchydata.com_crunchybridgeclusters.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: crunchybridgeclusters.postgres-operator.crunchydata.com
 spec:
   group: postgres-operator.crunchydata.com

config/crd/bases/postgres-operator.crunchydata.com_pgadmins.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: pgupgrades.postgres-operator.crunchydata.com
 spec:
   group: postgres-operator.crunchydata.com
@@ -963,6 +963,7 @@ spec:
                 type: object
               fromPostgresVersion:
                 description: The major version of PostgreSQL before the upgrade.
+                format: int32
                 maximum: 17
                 minimum: 11
                 type: integer
@@ -984,7 +985,7 @@ spec:
                 description: |-
                   The image pull secrets used to pull from a private registry.
                   Changing this value causes all running PGUpgrade pods to restart.
-                  https://k8s.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+                  https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry
                 items:
                   description: |-
                     LocalObjectReference contains enough information to let you locate the
@@ -1002,6 +1003,13 @@ spec:
                   type: object
                   x-kubernetes-map-type: atomic
                 type: array
+              jobs:
+                description: |-
+                  The number of simultaneous processes pg_upgrade should use.
+                  More info: https://www.postgresql.org/docs/current/pgupgrade.html
+                format: int32
+                minimum: 0
+                type: integer
               metadata:
                 description: Metadata contains metadata for custom resources
                 properties:
@@ -1015,14 +1023,14 @@ spec:
                     type: object
                 type: object
               postgresClusterName:
-                description: The name of the cluster to be updated
+                description: The name of the Postgres cluster to upgrade.
                 minLength: 1
                 type: string
               priorityClassName:
                 description: |-
                   Priority class name for the PGUpgrade pod. Changing this
                   value causes PGUpgrade pod to restart.
-                  More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/
+                  More info: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption
                 type: string
               resources:
                 description: Resource requirements for the PGUpgrade container.
@@ -1083,13 +1091,9 @@ spec:
                       More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                     type: object
                 type: object
-              toPostgresImage:
-                description: |-
-                  The image name to use for PostgreSQL containers after upgrade.
-                  When omitted, the value comes from an operator environment variable.
-                type: string
               toPostgresVersion:
                 description: The major version of PostgreSQL to be upgraded to.
+                format: int32
                 maximum: 17
                 minimum: 11
                 type: integer
@@ -1134,11 +1138,30 @@ spec:
                       type: string
                   type: object
                 type: array
+              transferMethod:
+                description: |-
+                  The method pg_upgrade should use to transfer files to the new cluster.
+                  More info: https://www.postgresql.org/docs/current/pgupgrade.html
+                enum:
+                - Clone
+                - Copy
+                - CopyFileRange
+                - Link
+                maxLength: 15
+                type: string
             required:
             - fromPostgresVersion
             - postgresClusterName
             - toPostgresVersion
             type: object
+            x-kubernetes-validations:
+            - rule: self.fromPostgresVersion < self.toPostgresVersion
+            - message: Only Copy or Link before PostgreSQL 12
+              rule: '!has(self.transferMethod) || (self.toPostgresVersion < 12 ? self.transferMethod
+                in ["Copy","Link"] : true)'
+            - message: Only Clone, Copy, or Link before PostgreSQL 17
+              rule: '!has(self.transferMethod) || (self.toPostgresVersion < 17 ? self.transferMethod
+                in ["Clone","Copy","Link"] : true)'
           status:
             description: PGUpgradeStatus defines the observed state of PGUpgrade
             properties: