PR feedback, v1

CrunchyData · Nov 8, 2024 · ea35ac4 · ea35ac4
1 parent 496247d
commit ea35ac4
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 16 deletions.
diff --git a/internal/controller/pgupgrade/jobs.go b/internal/controller/pgupgrade/jobs.go
@@ -147,7 +147,7 @@ func (r *PGUpgradeReconciler) generateUpgradeJob(
 
 	job.Annotations = Merge(upgrade.Spec.Metadata.GetAnnotationsOrNil(),
 		map[string]string{
-			naming.DefaultContainerLabel: database.Name,
+			naming.DefaultContainerAnnotation: database.Name,
 		})
 
 	// Copy the pod template from the startup instance StatefulSet. This includes
@@ -260,7 +260,7 @@ func (r *PGUpgradeReconciler) generateRemoveDataJob(
 
 	job.Annotations = Merge(upgrade.Spec.Metadata.GetAnnotationsOrNil(),
 		map[string]string{
-			naming.DefaultContainerLabel: database.Name,
+			naming.DefaultContainerAnnotation: database.Name,
 		})
 
 	// Copy the pod template from the sts instance StatefulSet. This includes

diff --git a/internal/controller/postgrescluster/instance.go b/internal/controller/postgrescluster/instance.go
@@ -1269,7 +1269,7 @@ func generateInstanceStatefulSetIntent(_ context.Context,
 		cluster.Spec.Metadata.GetAnnotationsOrNil(),
 		spec.Metadata.GetAnnotationsOrNil(),
 		map[string]string{
-			naming.DefaultContainerLabel: naming.ContainerDatabase,
+			naming.DefaultContainerAnnotation: naming.ContainerDatabase,
 		},
 	)
 	sts.Spec.Template.Labels = naming.Merge(

diff --git a/internal/controller/postgrescluster/pgadmin.go b/internal/controller/postgrescluster/pgadmin.go
@@ -260,7 +260,7 @@ func (r *Reconciler) reconcilePGAdminStatefulSet(
 		cluster.Spec.Metadata.GetAnnotationsOrNil(),
 		cluster.Spec.UserInterface.PGAdmin.Metadata.GetAnnotationsOrNil(),
 		map[string]string{
-			naming.DefaultContainerLabel: naming.ContainerPGAdmin,
+			naming.DefaultContainerAnnotation: naming.ContainerPGAdmin,
 		},
 	)
 	sts.Spec.Template.Labels = naming.Merge(

diff --git a/internal/controller/postgrescluster/pgbackrest.go b/internal/controller/postgrescluster/pgbackrest.go
@@ -585,7 +585,7 @@ func (r *Reconciler) generateRepoHostIntent(ctx context.Context, postgresCluster
 		postgresCluster.Spec.Metadata.GetAnnotationsOrNil(),
 		postgresCluster.Spec.Backups.PGBackRest.Metadata.GetAnnotationsOrNil(),
 		map[string]string{
-			naming.DefaultContainerLabel: naming.PGBackRestRepoContainerName,
+			naming.DefaultContainerAnnotation: naming.PGBackRestRepoContainerName,
 		},
 	)
 	labels := naming.Merge(
@@ -810,10 +810,10 @@ func generateBackupJobSpecIntent(ctx context.Context, postgresCluster *v1beta1.P
 	}
 
 	if annotations != nil {
-		annotations[naming.DefaultContainerLabel] = naming.PGBackRestRepoContainerName
+		annotations[naming.DefaultContainerAnnotation] = naming.PGBackRestRepoContainerName
 	} else {
 		annotations = map[string]string{
-			naming.DefaultContainerLabel: naming.PGBackRestRepoContainerName,
+			naming.DefaultContainerAnnotation: naming.PGBackRestRepoContainerName,
 		}
 	}
 
@@ -1285,8 +1285,8 @@ func (r *Reconciler) generateRestoreJobIntent(cluster *v1beta1.PostgresCluster,
 		cluster.Spec.Metadata.GetAnnotationsOrNil(),
 		cluster.Spec.Backups.PGBackRest.Metadata.GetAnnotationsOrNil(),
 		map[string]string{
-			naming.PGBackRestConfigHash:  configHash,
-			naming.DefaultContainerLabel: naming.PGBackRestRestoreContainerName,
+			naming.PGBackRestConfigHash:       configHash,
+			naming.DefaultContainerAnnotation: naming.PGBackRestRestoreContainerName,
 		})
 	labels := naming.Merge(
 		cluster.Spec.Metadata.GetLabelsOrNil(),

diff --git a/internal/controller/postgrescluster/pgbouncer.go b/internal/controller/postgrescluster/pgbouncer.go
@@ -373,7 +373,7 @@ func (r *Reconciler) generatePGBouncerDeployment(
 		cluster.Spec.Metadata.GetAnnotationsOrNil(),
 		cluster.Spec.Proxy.PGBouncer.Metadata.GetAnnotationsOrNil(),
 		map[string]string{
-			naming.DefaultContainerLabel: naming.ContainerPGBouncer,
+			naming.DefaultContainerAnnotation: naming.ContainerPGBouncer,
 		},
 	)
 	deploy.Spec.Template.Labels = naming.Merge(

diff --git a/internal/controller/postgrescluster/volumes.go b/internal/controller/postgrescluster/volumes.go
@@ -470,7 +470,7 @@ func (r *Reconciler) reconcileMovePGDataDir(ctx context.Context,
 	jobSpec := &batchv1.JobSpec{
 		Template: corev1.PodTemplateSpec{
 			ObjectMeta: metav1.ObjectMeta{Labels: labels, Annotations: map[string]string{
-				naming.DefaultContainerLabel: naming.ContainerJobMovePGDataDir,
+				naming.DefaultContainerAnnotation: naming.ContainerJobMovePGDataDir,
 			}},
 			Spec: corev1.PodSpec{
 				// Set the image pull secrets, if any exist.
@@ -589,7 +589,7 @@ func (r *Reconciler) reconcileMoveWALDir(ctx context.Context,
 	jobSpec := &batchv1.JobSpec{
 		Template: corev1.PodTemplateSpec{
 			ObjectMeta: metav1.ObjectMeta{Labels: labels, Annotations: map[string]string{
-				naming.DefaultContainerLabel: naming.ContainerJobMovePGWALDir,
+				naming.DefaultContainerAnnotation: naming.ContainerJobMovePGWALDir,
 			}},
 			Spec: corev1.PodSpec{
 				// Set the image pull secrets, if any exist.
@@ -713,7 +713,7 @@ func (r *Reconciler) reconcileMoveRepoDir(ctx context.Context,
 	jobSpec := &batchv1.JobSpec{
 		Template: corev1.PodTemplateSpec{
 			ObjectMeta: metav1.ObjectMeta{Labels: labels, Annotations: map[string]string{
-				naming.DefaultContainerLabel: naming.ContainerJobMovePGBackRestRepoDir,
+				naming.DefaultContainerAnnotation: naming.ContainerJobMovePGBackRestRepoDir,
 			}},
 			Spec: corev1.PodSpec{
 				// Set the image pull secrets, if any exist.

diff --git a/internal/controller/standalone_pgadmin/statefulset.go b/internal/controller/standalone_pgadmin/statefulset.go
@@ -77,7 +77,7 @@ func statefulset(
 	sts.Spec.Template.Annotations = naming.Merge(
 		pgadmin.Spec.Metadata.GetAnnotationsOrNil(),
 		map[string]string{
-			naming.DefaultContainerLabel: naming.ContainerPGAdmin,
+			naming.DefaultContainerAnnotation: naming.ContainerPGAdmin,
 		},
 	)
 	sts.Spec.Template.Labels = naming.Merge(

diff --git a/internal/naming/annotations.go b/internal/naming/annotations.go
@@ -70,6 +70,7 @@ const (
 	AuthorizeBackupRemovalAnnotation = annotationPrefix + "authorizeBackupRemoval"
 
 	// Used from Kubernetes v1.21+ to define a default container used when the
-	// `-c` flag is not passed
-	DefaultContainerLabel = "kubectl.kubernetes.io/default-container"
+	// `-c` flag is not passed.
+	// --https://kubernetes.io/docs/reference/labels-annotations-taints/#kubectl-kubernetes-io-default-container
+	DefaultContainerAnnotation = "kubectl.kubernetes.io/default-container"
 )