Skip to content

Commit ea35ac4

Browse files
benjaminjbbenjaminjb
committed
PR feedback, v1
1 parent 496247d commit ea35ac4

File tree

8 files changed

+17
-16
lines changed

8 files changed

+17
-16
lines changed

‎internal/controller/pgupgrade/jobs.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ func (r *PGUpgradeReconciler) generateUpgradeJob(
147147

148148
job.Annotations = Merge(upgrade.Spec.Metadata.GetAnnotationsOrNil(),
149149
map[string]string{
150-
naming.DefaultContainerLabel: database.Name,
150+
naming.DefaultContainerAnnotation: database.Name,
151151
})
152152

153153
// Copy the pod template from the startup instance StatefulSet. This includes
@@ -260,7 +260,7 @@ func (r *PGUpgradeReconciler) generateRemoveDataJob(
260260

261261
job.Annotations = Merge(upgrade.Spec.Metadata.GetAnnotationsOrNil(),
262262
map[string]string{
263-
naming.DefaultContainerLabel: database.Name,
263+
naming.DefaultContainerAnnotation: database.Name,
264264
})
265265

266266
// Copy the pod template from the sts instance StatefulSet. This includes

‎internal/controller/postgrescluster/instance.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1269,7 +1269,7 @@ func generateInstanceStatefulSetIntent(_ context.Context,
12691269
cluster.Spec.Metadata.GetAnnotationsOrNil(),
12701270
spec.Metadata.GetAnnotationsOrNil(),
12711271
map[string]string{
1272-
naming.DefaultContainerLabel: naming.ContainerDatabase,
1272+
naming.DefaultContainerAnnotation: naming.ContainerDatabase,
12731273
},
12741274
)
12751275
sts.Spec.Template.Labels = naming.Merge(

‎internal/controller/postgrescluster/pgadmin.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ func (r *Reconciler) reconcilePGAdminStatefulSet(
260260
cluster.Spec.Metadata.GetAnnotationsOrNil(),
261261
cluster.Spec.UserInterface.PGAdmin.Metadata.GetAnnotationsOrNil(),
262262
map[string]string{
263-
naming.DefaultContainerLabel: naming.ContainerPGAdmin,
263+
naming.DefaultContainerAnnotation: naming.ContainerPGAdmin,
264264
},
265265
)
266266
sts.Spec.Template.Labels = naming.Merge(

‎internal/controller/postgrescluster/pgbackrest.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ func (r *Reconciler) generateRepoHostIntent(ctx context.Context, postgresCluster
585585
postgresCluster.Spec.Metadata.GetAnnotationsOrNil(),
586586
postgresCluster.Spec.Backups.PGBackRest.Metadata.GetAnnotationsOrNil(),
587587
map[string]string{
588-
naming.DefaultContainerLabel: naming.PGBackRestRepoContainerName,
588+
naming.DefaultContainerAnnotation: naming.PGBackRestRepoContainerName,
589589
},
590590
)
591591
labels := naming.Merge(
@@ -810,10 +810,10 @@ func generateBackupJobSpecIntent(ctx context.Context, postgresCluster *v1beta1.P
810810
}
811811

812812
if annotations != nil {
813-
annotations[naming.DefaultContainerLabel] = naming.PGBackRestRepoContainerName
813+
annotations[naming.DefaultContainerAnnotation] = naming.PGBackRestRepoContainerName
814814
} else {
815815
annotations = map[string]string{
816-
naming.DefaultContainerLabel: naming.PGBackRestRepoContainerName,
816+
naming.DefaultContainerAnnotation: naming.PGBackRestRepoContainerName,
817817
}
818818
}
819819

@@ -1285,8 +1285,8 @@ func (r *Reconciler) generateRestoreJobIntent(cluster *v1beta1.PostgresCluster,
12851285
cluster.Spec.Metadata.GetAnnotationsOrNil(),
12861286
cluster.Spec.Backups.PGBackRest.Metadata.GetAnnotationsOrNil(),
12871287
map[string]string{
1288-
naming.PGBackRestConfigHash: configHash,
1289-
naming.DefaultContainerLabel: naming.PGBackRestRestoreContainerName,
1288+
naming.PGBackRestConfigHash: configHash,
1289+
naming.DefaultContainerAnnotation: naming.PGBackRestRestoreContainerName,
12901290
})
12911291
labels := naming.Merge(
12921292
cluster.Spec.Metadata.GetLabelsOrNil(),

‎internal/controller/postgrescluster/pgbouncer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ func (r *Reconciler) generatePGBouncerDeployment(
373373
cluster.Spec.Metadata.GetAnnotationsOrNil(),
374374
cluster.Spec.Proxy.PGBouncer.Metadata.GetAnnotationsOrNil(),
375375
map[string]string{
376-
naming.DefaultContainerLabel: naming.ContainerPGBouncer,
376+
naming.DefaultContainerAnnotation: naming.ContainerPGBouncer,
377377
},
378378
)
379379
deploy.Spec.Template.Labels = naming.Merge(

‎internal/controller/postgrescluster/volumes.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ func (r *Reconciler) reconcileMovePGDataDir(ctx context.Context,
470470
jobSpec := &batchv1.JobSpec{
471471
Template: corev1.PodTemplateSpec{
472472
ObjectMeta: metav1.ObjectMeta{Labels: labels, Annotations: map[string]string{
473-
naming.DefaultContainerLabel: naming.ContainerJobMovePGDataDir,
473+
naming.DefaultContainerAnnotation: naming.ContainerJobMovePGDataDir,
474474
}},
475475
Spec: corev1.PodSpec{
476476
// Set the image pull secrets, if any exist.
@@ -589,7 +589,7 @@ func (r *Reconciler) reconcileMoveWALDir(ctx context.Context,
589589
jobSpec := &batchv1.JobSpec{
590590
Template: corev1.PodTemplateSpec{
591591
ObjectMeta: metav1.ObjectMeta{Labels: labels, Annotations: map[string]string{
592-
naming.DefaultContainerLabel: naming.ContainerJobMovePGWALDir,
592+
naming.DefaultContainerAnnotation: naming.ContainerJobMovePGWALDir,
593593
}},
594594
Spec: corev1.PodSpec{
595595
// Set the image pull secrets, if any exist.
@@ -713,7 +713,7 @@ func (r *Reconciler) reconcileMoveRepoDir(ctx context.Context,
713713
jobSpec := &batchv1.JobSpec{
714714
Template: corev1.PodTemplateSpec{
715715
ObjectMeta: metav1.ObjectMeta{Labels: labels, Annotations: map[string]string{
716-
naming.DefaultContainerLabel: naming.ContainerJobMovePGBackRestRepoDir,
716+
naming.DefaultContainerAnnotation: naming.ContainerJobMovePGBackRestRepoDir,
717717
}},
718718
Spec: corev1.PodSpec{
719719
// Set the image pull secrets, if any exist.

‎internal/controller/standalone_pgadmin/statefulset.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func statefulset(
7777
sts.Spec.Template.Annotations = naming.Merge(
7878
pgadmin.Spec.Metadata.GetAnnotationsOrNil(),
7979
map[string]string{
80-
naming.DefaultContainerLabel: naming.ContainerPGAdmin,
80+
naming.DefaultContainerAnnotation: naming.ContainerPGAdmin,
8181
},
8282
)
8383
sts.Spec.Template.Labels = naming.Merge(

‎internal/naming/annotations.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ const (
7070
AuthorizeBackupRemovalAnnotation = annotationPrefix + "authorizeBackupRemoval"
7171

7272
// Used from Kubernetes v1.21+ to define a default container used when the
73-
// `-c` flag is not passed
74-
DefaultContainerLabel = "kubectl.kubernetes.io/default-container"
73+
// `-c` flag is not passed.
74+
// --https://kubernetes.io/docs/reference/labels-annotations-taints/#kubectl-kubernetes-io-default-container
75+
DefaultContainerAnnotation = "kubectl.kubernetes.io/default-container"
7576
)

0 commit comments

Comments
 (0)