Backport changes for WME 2.1.4 and Helm chart

rjeberhard · rjeberhard · commit 308b393a8873 · 2023-06-06T18:28:47.000-04:00
diff --git a/documentation/domains/Domain.json b/documentation/domains/Domain.json
@@ -688,8 +688,8 @@
       "type": "object",
       "properties": {
         "image": {
-          "default": "ghcr.io/oracle/weblogic-monitoring-exporter:2.1.3",
-          "description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.3",
+          "default": "ghcr.io/oracle/weblogic-monitoring-exporter:2.1.4",
+          "description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.4",
           "type": "string"
         },
         "imagePullPolicy": {
diff --git a/documentation/domains/Domain.md b/documentation/domains/Domain.md
@@ -126,7 +126,7 @@ The current status of the operation of the WebLogic domain. Updated automaticall
 | Name | Type | Description |
 | --- | --- | --- |
 | `configuration` | Map | The configuration for the WebLogic Monitoring Exporter. If WebLogic Server instances are already running and have the monitoring exporter sidecar container, then changes to this field will be propagated to the exporter without requiring the restart of the WebLogic Server instances. |
-| `image` | string | The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.3 |
+| `image` | string | The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.4 |
 | `imagePullPolicy` | string | The image pull policy for the WebLogic Monitoring Exporter sidecar container image. Legal values are Always, Never, and IfNotPresent. Defaults to Always if image ends in :latest; IfNotPresent, otherwise. |
 | `port` | integer | The port exposed by the WebLogic Monitoring Exporter running in the sidecar container. Defaults to 8080. The port value must not conflict with a port used by any WebLogic Server instance, including the ports of built-in channels or network access points (NAPs). |
 | `resources` | [Resource Requirements](k8s1.13.5.md#resource-requirements) | Memory and CPU minimum requirements and limits for the Monitoring exporter sidecar. See `kubectl explain pods.spec.containers.resources`. |
diff --git a/kubernetes/charts/weblogic-operator/templates/_operator-clusterrole-general.tpl b/kubernetes/charts/weblogic-operator/templates/_operator-clusterrole-general.tpl
@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2023, 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.operatorClusterRoleGeneral" }}
diff --git a/kubernetes/charts/weblogic-operator/templates/_operator-clusterrole-namespace.tpl b/kubernetes/charts/weblogic-operator/templates/_operator-clusterrole-namespace.tpl
@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2023, 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.operatorClusterRoleNamespace" }}
diff --git a/kubernetes/charts/weblogic-operator/templates/_operator-clusterrolebinding-auth-delegator.tpl b/kubernetes/charts/weblogic-operator/templates/_operator-clusterrolebinding-auth-delegator.tpl
diff --git a/kubernetes/charts/weblogic-operator/templates/_operator-clusterrolebinding-discovery.tpl b/kubernetes/charts/weblogic-operator/templates/_operator-clusterrolebinding-discovery.tpl
diff --git a/kubernetes/charts/weblogic-operator/templates/_operator-dep.tpl b/kubernetes/charts/weblogic-operator/templates/_operator-dep.tpl
@@ -86,7 +86,7 @@ spec:
         - name: "JAVA_LOGGING_LEVEL"
           value: {{ .javaLoggingLevel | quote }}
         - name: "JAVA_LOGGING_MAXSIZE"
-          value: {{ .javaLoggingFileSizeLimit | default 20000000 | quote }}
+          value: {{ int64 .javaLoggingFileSizeLimit | default 20000000 | quote }}
         - name: "JAVA_LOGGING_COUNT"
           value: {{ .javaLoggingFileCount | default 10 | quote }}
         {{- if .remoteDebugNodePortEnabled }}
diff --git a/kubernetes/charts/weblogic-operator/templates/_operator.tpl b/kubernetes/charts/weblogic-operator/templates/_operator.tpl
@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 {{- if and (not (empty .Capabilities.APIVersions)) (not (.Capabilities.APIVersions.Has "policy/v1")) }}
@@ -14,8 +14,6 @@
 {{- include "operator.operatorClusterRoleOperatorAdmin" . }}
 {{- include "operator.operatorClusterRoleDomainAdmin" . }}
 {{- include "operator.clusterRoleBindingGeneral" . }}
-{{- include "operator.clusterRoleBindingAuthDelegator" . }}
-{{- include "operator.clusterRoleBindingDiscovery" . }}
 {{- if not (eq .domainNamespaceSelectionStrategy "Dedicated") }}
 {{-   include "operator.clusterRoleBindingNonResource" . }}
 {{- end }}
diff --git a/kubernetes/crd/domain-crd.yaml b/kubernetes/crd/domain-crd.yaml
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    weblogic.sha256: f9d602e9832c79cc4b9ae676c4681e3c6ccd0301a76f8f46a5d2e6cea7c9bf4d
+    weblogic.sha256: 9787fdef5b2b74e46fb50e38f850b3d08656e788ceeb86ee004c8e57e6927b74
   name: domains.weblogic.oracle
 spec:
   group: weblogic.oracle
@@ -47,9 +47,9 @@ spec:
                   appropriate. See https://github.com/oracle/weblogic-monitoring-exporter.
                 properties:
                   image:
-                    default: ghcr.io/oracle/weblogic-monitoring-exporter:2.1.3
+                    default: ghcr.io/oracle/weblogic-monitoring-exporter:2.1.4
                     description: The WebLogic Monitoring Exporter sidecar container
-                      image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.3
+                      image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.4
                     type: string
                   imagePullPolicy:
                     description: The image pull policy for the WebLogic Monitoring
diff --git a/kubernetes/samples/charts/README.md b/kubernetes/samples/charts/README.md
@@ -6,9 +6,4 @@ The WebLogic Kubernetes Operator supports three load balancers: Traefik, NGINX,
 
 * [traefik](traefik/README.md)
 * [NGINX](nginx/README.md)
-* apache-samples/[custom-sample](apache-samples/custom-sample/README.md)
-* apache-samples/[default-sample](apache-samples/default-sample/README.md)
 * [ingress-per-domain](ingress-per-domain/README.md)
-* [apache-webtier](apache-webtier/README.md)
-
-**Note**: The apache-webtier script contains a Helm chart that is used in the Apache samples.
diff --git a/kubernetes/src/test/java/oracle/kubernetes/operator/create/CreateOperatorGeneratedFilesTestBase.java b/kubernetes/src/test/java/oracle/kubernetes/operator/create/CreateOperatorGeneratedFilesTestBase.java
@@ -262,7 +262,7 @@ protected V1Deployment getExpectedWeblogicOperatorDeployment() {
                                         .addEnvItem(
                                             newEnvVar()
                                                 .name("JAVA_LOGGING_MAXSIZE")
-                                                .value("2e+07"))
+                                                .value("20000000"))
                                         .addEnvItem(
                                             newEnvVar()
                                                 .name("JAVA_LOGGING_COUNT")
@@ -557,59 +557,6 @@ private V1ClusterRoleBinding getExpectedOperatorRoleBindingNonResource() {
                 .apiGroup(KubernetesArtifactUtils.API_GROUP_RBAC));
   }
 
-  @Test
-  void generatesCorrect_operatorRoleBindingDiscovery() {
-    assertThat(
-        getGeneratedFiles().getOperatorRoleBindingDiscovery(),
-        equalTo(getExpectedOperatorRoleBindingDiscovery()));
-  }
-
-  private V1ClusterRoleBinding getExpectedOperatorRoleBindingDiscovery() {
-    return newClusterRoleBinding()
-        .metadata(
-            newObjectMeta()
-                .name(
-                    getInputs().getNamespace() + "-weblogic-operator-clusterrolebinding-discovery")
-                .putLabelsItem(OPERATORNAME_LABEL, getInputs().getNamespace()))
-        .addSubjectsItem(
-            newSubject()
-                .kind("ServiceAccount")
-                .name(getInputs().getServiceAccount())
-                .namespace(getInputs().getNamespace())
-                .apiGroup(""))
-        .roleRef(
-            newClusterRoleRef()
-                .name("system:discovery")
-                .apiGroup(KubernetesArtifactUtils.API_GROUP_RBAC));
-  }
-
-  @Test
-  void generatesCorrect_operatorRoleBindingAuthDelegator() {
-    assertThat(
-        getGeneratedFiles().getOperatorRoleBindingAuthDelegator(),
-        equalTo(getExpectedOperatorRoleBindingAuthDelegator()));
-  }
-
-  private V1ClusterRoleBinding getExpectedOperatorRoleBindingAuthDelegator() {
-    return newClusterRoleBinding()
-        .metadata(
-            newObjectMeta()
-                .name(
-                    getInputs().getNamespace()
-                        + "-weblogic-operator-clusterrolebinding-auth-delegator")
-                .putLabelsItem(OPERATORNAME_LABEL, getInputs().getNamespace()))
-        .addSubjectsItem(
-            newSubject()
-                .kind("ServiceAccount")
-                .name(getInputs().getServiceAccount())
-                .namespace(getInputs().getNamespace())
-                .apiGroup(""))
-        .roleRef(
-            newClusterRoleRef()
-                .name("system:auth-delegator")
-                .apiGroup(KubernetesArtifactUtils.API_GROUP_RBAC));
-  }
-
   @Test
   void generatesCorrect_weblogicOperatorNamespaceRole() {
     assertThat(
diff --git a/kubernetes/src/test/java/oracle/kubernetes/operator/utils/GeneratedOperatorObjects.java b/kubernetes/src/test/java/oracle/kubernetes/operator/utils/GeneratedOperatorObjects.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, 2021, Oracle and/or its affiliates.
+// Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator.utils;
@@ -82,14 +82,6 @@ public V1ClusterRoleBinding getOperatorRoleBindingNonResource() {
     return securityYaml.getOperatorRoleBindingNonResource();
   }
 
-  public V1ClusterRoleBinding getOperatorRoleBindingDiscovery() {
-    return securityYaml.getOperatorRoleBindingDiscovery();
-  }
-
-  public V1ClusterRoleBinding getOperatorRoleBindingAuthDelegator() {
-    return securityYaml.getOperatorRoleBindingAuthDelegator();
-  }
-
   public V1ClusterRole getWeblogicOperatorNamespaceRole() {
     return securityYaml.getWeblogicOperatorNamespaceRole();
   }
diff --git a/kubernetes/src/test/java/oracle/kubernetes/operator/utils/ParsedWeblogicOperatorSecurityYaml.java b/kubernetes/src/test/java/oracle/kubernetes/operator/utils/ParsedWeblogicOperatorSecurityYaml.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, 2021, Oracle and/or its affiliates.
+// Copyright (c) 2018, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator.utils;
@@ -55,16 +55,6 @@ public V1ClusterRoleBinding getOperatorRoleBindingNonResource() {
         .find(inputs.getNamespace() + "-weblogic-operator-clusterrolebinding-nonresource");
   }
 
-  public V1ClusterRoleBinding getOperatorRoleBindingDiscovery() {
-    return getClusterRoleBindings()
-        .find(inputs.getNamespace() + "-weblogic-operator-clusterrolebinding-discovery");
-  }
-
-  public V1ClusterRoleBinding getOperatorRoleBindingAuthDelegator() {
-    return getClusterRoleBindings()
-        .find(inputs.getNamespace() + "-weblogic-operator-clusterrolebinding-auth-delegator");
-  }
-
   public V1ClusterRole getWeblogicOperatorNamespaceRole() {
     return getClusterRoles()
         .find(inputs.getNamespace() + "-weblogic-operator-clusterrole-namespace");
diff --git a/operator/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java b/operator/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java
@@ -8,7 +8,7 @@
 /** Kubernetes constants. */
 public interface KubernetesConstants {
   String DEFAULT_IMAGE = "container-registry.oracle.com/middleware/weblogic:12.2.1.4";
-  String DEFAULT_EXPORTER_IMAGE = "ghcr.io/oracle/weblogic-monitoring-exporter:2.1.3";
+  String DEFAULT_EXPORTER_IMAGE = "ghcr.io/oracle/weblogic-monitoring-exporter:2.1.4";
   String DEFAULT_FLUENTD_IMAGE = "fluent/fluentd-kubernetes-daemonset:v1.14.5-debian-elasticsearch7-1.1";
   String EXPORTER_CONTAINER_NAME = "monitoring-exporter";
   String LATEST_IMAGE_SUFFIX = ":latest";

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright (c) 2018, 2022, Oracle and/or its affiliates.`
	`1`	`+# Copyright (c) 2018, 2023, Oracle and/or its affiliates.`
`2`	`2`	`# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.`
`3`	`3`
`4`	`4`	`{{- define "operator.operatorClusterRoleGeneral" }}`