Add Role to hack/add-cvo-overrides.sh

Author: dmage

hack/add-cvo-overrides.sh

@@ -1,5 +1,22 @@
 #!/bin/sh -eu
 
+override() {
+    local group="$1" kind="$2" namespace="$3" name="$4" current
+    current=$(kubectl get clusterversion version -o go-template="{{range .spec.overrides}}{{if and (eq .group \"$group\") (eq .kind \"$kind\") (eq .namespace \"$namespace\") (eq .name \"$name\")}}{{.unmanaged}}{{end}}{{end}}")
+    if [ -z "$current" ]; then
+        kubectl patch clusterversion version --type json -p "
+        - op: add
+          path: /spec/overrides/-
+          value:
+            group: $group
+            kind: $kind
+            namespace: \"$namespace\"
+            name: $name
+            unmanaged: true
+        "
+    fi
+}
+
 OVERRIDES=$(kubectl get clusterversion/version -o jsonpath='{.spec.overrides}')
 if [ -z "$OVERRIDES" ]; then
     kubectl patch clusterversion version --type json -p '
@@ -9,44 +26,8 @@ if [ -z "$OVERRIDES" ]; then
     '
 fi
 
-CURRENT=$(kubectl get clusterversion/version -o jsonpath='{.spec.overrides[?(@.name=="cluster-image-registry-operator")].name}')
-if [ -z "$CURRENT" ]; then
-    kubectl patch clusterversion version --type json -p '
-    - op: add
-      path: /spec/overrides/-
-      value:
-        group: apps
-        kind: Deployment
-        name: cluster-image-registry-operator
-        namespace: openshift-image-registry
-        unmanaged: true
-    '
-fi
-
-CURRENT=$(kubectl get clusterversion/version -o jsonpath='{.spec.overrides[?(@.name=="configs.imageregistry.operator.openshift.io")].name}')
-if [ -z "$CURRENT" ]; then
-    kubectl patch clusterversion version --type json -p '
-    - op: add
-      path: /spec/overrides/-
-      value:
-        group: apiextensions.k8s.io
-        kind: CustomResourceDefinition
-        name: configs.imageregistry.operator.openshift.io
-        namespace: ""
-        unmanaged: true
-    '
-fi
-
-CURRENT=$(kubectl get clusterversion/version -o jsonpath='{.spec.overrides[?(@.name=="imagepruners.imageregistry.operator.openshift.io")].name}')
-if [ -z "$CURRENT" ]; then
-    kubectl patch clusterversion version --type json -p '
-    - op: add
-      path: /spec/overrides/-
-      value:
-        group: apiextensions.k8s.io
-        kind: CustomResourceDefinition
-        name: imagepruners.imageregistry.operator.openshift.io
-        namespace: ""
-        unmanaged: true
-    '
-fi
+override apps Deployment openshift-image-registry cluster-image-registry-operator
+override apiextensions.k8s.io CustomResourceDefinition "" configs.imageregistry.operator.openshift.io
+override apiextensions.k8s.io CustomResourceDefinition "" imagepruners.imageregistry.operator.openshift.io
+override rbac.authorization.k8s.io ClusterRole "" cluster-image-registry-operator
+override rbac.authorization.k8s.io Role openshift-image-registry cluster-image-registry-operator