From a8de2ec2d93da383fea6fe4720586817d54b037a Mon Sep 17 00:00:00 2001 From: Daniel Franz Date: Wed, 15 Mar 2023 09:27:58 -0700 Subject: [PATCH] Registry Pod Controller Flag (#2928) Sets the marketplace pod's ownerreference to have `controller: true` to remove need for forceful node drain. Upstream-repository: operator-lifecycle-manager Upstream-commit: e5da837 Signed-off-by: Daniel Franz --- .../pkg/controller/operators/catalog/operator_test.go | 2 +- .../pkg/controller/registry/reconciler/configmap.go | 2 +- .../pkg/controller/registry/reconciler/grpc.go | 2 +- .../pkg/controller/registry/reconciler/configmap.go | 2 +- .../pkg/controller/registry/reconciler/grpc.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator_test.go b/staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator_test.go index 51b07250c7..da3a215c88 100644 --- a/staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator_test.go +++ b/staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator_test.go @@ -1759,7 +1759,7 @@ func toManifest(t *testing.T, obj runtime.Object) string { func pod(s v1alpha1.CatalogSource) *corev1.Pod { pod := reconciler.Pod(&s, "registry-server", s.Spec.Image, s.GetName(), s.GetLabels(), s.GetAnnotations(), 5, 10, 1001) - ownerutil.AddOwner(pod, &s, false, false) + ownerutil.AddOwner(pod, &s, false, true) return pod } diff --git a/staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/configmap.go b/staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/configmap.go index f264d1bee3..11a87a8746 100644 --- a/staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/configmap.go +++ b/staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/configmap.go @@ -105,7 +105,7 @@ func (s *configMapCatalogSourceDecorator) Pod(image string) *corev1.Pod { pod := Pod(s.CatalogSource, "configmap-registry-server", image, "", s.Labels(), s.Annotations(), 5, 5, s.runAsUser) pod.Spec.ServiceAccountName = s.GetName() + ConfigMapServerPostfix pod.Spec.Containers[0].Command = []string{"configmap-server", "-c", s.Spec.ConfigMap, "-n", s.GetNamespace()} - ownerutil.AddOwner(pod, s.CatalogSource, false, false) + ownerutil.AddOwner(pod, s.CatalogSource, false, true) return pod } diff --git a/staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go b/staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go index 93e28e6286..117c081b23 100644 --- a/staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go +++ b/staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go @@ -124,7 +124,7 @@ func (s *grpcCatalogSourceDecorator) ServiceAccount() *corev1.ServiceAccount { func (s *grpcCatalogSourceDecorator) Pod(saName string) *corev1.Pod { pod := Pod(s.CatalogSource, "registry-server", s.Spec.Image, saName, s.Labels(), s.Annotations(), 5, 10, s.createPodAsUser) - ownerutil.AddOwner(pod, s.CatalogSource, false, false) + ownerutil.AddOwner(pod, s.CatalogSource, false, true) return pod } diff --git a/vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/configmap.go b/vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/configmap.go index f264d1bee3..11a87a8746 100644 --- a/vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/configmap.go +++ b/vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/configmap.go @@ -105,7 +105,7 @@ func (s *configMapCatalogSourceDecorator) Pod(image string) *corev1.Pod { pod := Pod(s.CatalogSource, "configmap-registry-server", image, "", s.Labels(), s.Annotations(), 5, 5, s.runAsUser) pod.Spec.ServiceAccountName = s.GetName() + ConfigMapServerPostfix pod.Spec.Containers[0].Command = []string{"configmap-server", "-c", s.Spec.ConfigMap, "-n", s.GetNamespace()} - ownerutil.AddOwner(pod, s.CatalogSource, false, false) + ownerutil.AddOwner(pod, s.CatalogSource, false, true) return pod } diff --git a/vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go b/vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go index 93e28e6286..117c081b23 100644 --- a/vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go +++ b/vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go @@ -124,7 +124,7 @@ func (s *grpcCatalogSourceDecorator) ServiceAccount() *corev1.ServiceAccount { func (s *grpcCatalogSourceDecorator) Pod(saName string) *corev1.Pod { pod := Pod(s.CatalogSource, "registry-server", s.Spec.Image, saName, s.Labels(), s.Annotations(), 5, 10, s.createPodAsUser) - ownerutil.AddOwner(pod, s.CatalogSource, false, false) + ownerutil.AddOwner(pod, s.CatalogSource, false, true) return pod }