diff --git a/manifests/operator-service-account-rbac.yaml b/manifests/operator-service-account-rbac.yaml index 4fd4676ccb8a7cbe40f5614caef7c382fb075982..f87c8d8cd6778f8bc5088288de0015191f03c583 100644 --- a/manifests/operator-service-account-rbac.yaml +++ b/manifests/operator-service-account-rbac.yaml @@ -25,6 +25,7 @@ rules: verbs: - create - get + - patch - apiGroups: - "" resources: diff --git a/pkg/controller/util.go b/pkg/controller/util.go index 57633ae8230e18addcf1e09f4d362e8afeeb7e0a..f9fc4468ae3311787bea894945db0edb7e2b9547 100644 --- a/pkg/controller/util.go +++ b/pkg/controller/util.go @@ -1,11 +1,13 @@ package controller import ( + "encoding/json" "fmt" "k8s.io/api/core/v1" apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1" @@ -52,7 +54,15 @@ func (c *Controller) createOperatorCRD(crd *apiextv1beta1.CustomResourceDefiniti if !k8sutil.ResourceAlreadyExists(err) { return fmt.Errorf("could not create customResourceDefinition: %v", err) } - c.logger.Infof("customResourceDefinition %q is already registered", crd.Name) + c.logger.Infof("customResourceDefinition %q is already registered and will only be updated", crd.Name) + + patch, err := json.Marshal(crd) + if err != nil { + return fmt.Errorf("could not marshal new customResourceDefintion: %v", err) + } + if _, err := c.KubeClient.CustomResourceDefinitions().Patch(crd.Name, types.MergePatchType, patch); err != nil { + return fmt.Errorf("could not update customResourceDefinition: %v", err) + } } else { c.logger.Infof("customResourceDefinition %q has been registered", crd.Name) }