Merge remote-tracking branch 'origin/main' into release/4.0

Author: rjeberhard

kubernetes/charts/weblogic-operator/Chart.yaml

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 apiVersion: v1

kubernetes/charts/weblogic-operator/templates/_operator-clusterrole-domain-admin.tpl

@@ -32,9 +32,9 @@ rules:
   resources: ["pods/exec"]
   verbs: ["get", "create"]
 - apiGroups: ["weblogic.oracle"]
-  resources: ["clusters", "domains"]
+  resources: ["domains", "clusters"]
   verbs: ["get", "list", "watch", "create", "update", "patch", "delete", "deletecollection"]
 - apiGroups: ["weblogic.oracle"]
-  resources: ["domains/status"]
+  resources: ["domains/status", "clusters/status"]
   verbs: ["get", "watch"]
 {{- end }}

kubernetes/charts/weblogic-operator/templates/_operator-clusterrole-general.tpl

@@ -28,7 +28,7 @@ rules:
   verbs: ["get", "list", "watch", "create", "update", "patch"]
 {{- end }}
 - apiGroups: ["weblogic.oracle"]
-  resources: ["clusters", "domains", "domains/status", "clusters/status"]
+  resources: ["domains", "clusters", "domains/status", "clusters/status"]
   verbs: ["get", "create", "list", "watch", "update", "patch"]
 - apiGroups: ["authentication.k8s.io"]
   resources: ["tokenreviews"]

kubernetes/charts/weblogic-operator/templates/_operator-dep.tpl

@@ -114,7 +114,7 @@ spec:
           runAsNonRoot: true
           seccompProfile:
             type: RuntimeDefault
-        {{- end }}            
+        {{- end }}
         volumeMounts:
         - name: "weblogic-operator-cm-volume"
           mountPath: "/deployment/config"

kubernetes/charts/weblogic-operator/templates/_operator-external-svc.tpl

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 {{- define "operator.operatorExternalService" }}

kubernetes/src/test/java/oracle/kubernetes/operator/create/CreateOperatorGeneratedFilesTestBase.java

@@ -450,8 +450,8 @@ private V1ClusterRole getExpectedWeblogicOperatorClusterRole() {
         .addRulesItem(
             newPolicyRule()
                 .addApiGroupsItem("weblogic.oracle")
-                .addResourcesItem("clusters")
                 .addResourcesItem("domains")
+                .addResourcesItem("clusters")
                 .addResourcesItem("domains/status")
                 .addResourcesItem("clusters/status")
                 .verbs(asList("get", "create", "list", "watch", "update", "patch")))