Merge branch 'backport-mr4416-41' into 'release/4.1'

Backport MR 4416 to release/4.1

See merge request weblogic-cloud/weblogic-kubernetes-operator!4426

Author: rjeberhard

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItSystemResOverrides.java

@@ -53,10 +53,13 @@
 import static oracle.weblogic.kubernetes.actions.TestActions.getNextIntrospectVersion;
 import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
 import static oracle.weblogic.kubernetes.actions.TestActions.getServicePort;
+import static oracle.weblogic.kubernetes.actions.TestActions.shutdownDomain;
+import static oracle.weblogic.kubernetes.actions.TestActions.startDomain;
 import static oracle.weblogic.kubernetes.actions.impl.Domain.patchDomainCustomResource;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.podStateNotChanged;
 import static oracle.weblogic.kubernetes.utils.BuildApplication.buildApplication;
 import static oracle.weblogic.kubernetes.utils.ClusterUtils.createClusterResourceAndAddReferenceToDomain;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getHostAndPort;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
@@ -501,5 +504,27 @@ private void createDomainOnPVUsingWlst(Path wlstScriptFile, Path domainPropertie
     createDomainJob(WEBLOGIC_IMAGE_TO_USE_IN_SPEC, pvName, pvcName, domainScriptConfigMapName,
         namespace, jobCreationContainer);
   }
+  
+  //restart pods by manipulating the serverStartPolicy to Never and IfNeeded
+  private void restartDomain() {
+    logger.info("Restarting domain {0}", domainNamespace);
+    shutdownDomain(domainUid, domainNamespace);
+
+    logger.info("Checking for admin server pod shutdown");
+    checkPodDoesNotExist(adminServerPodName, domainUid, domainNamespace);
+    logger.info("Checking managed server pods were shutdown");
+    for (int i = 1; i <= replicaCount; i++) {
+      checkPodDoesNotExist(managedServerPodNamePrefix + i, domainUid, domainNamespace);
+    }
+
+    startDomain(domainUid, domainNamespace);
+    checkPodReadyAndServiceExists(adminServerPodName, domainUid, domainNamespace);
+    // verify managed server services and pods are created
+    for (int i = 1; i <= replicaCount; i++) {
+      logger.info("Wait for managed pod {0} to be ready in namespace {1}",
+          managedServerPodNamePrefix + i, domainNamespace);
+      checkPodReadyAndServiceExists(managedServerPodNamePrefix + i, domainUid, domainNamespace);
+    }
+  }
 
 }

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java

@@ -775,7 +775,7 @@ public static void installDBOperator(String namespace) throws IOException {
     replaceStringInFile(operatorYamlDestFile.toString(), "oracle-database-operator-system", namespace);
     replaceStringInFile(operatorYamlDestFile.toString(), "container-registry-secret", TEST_IMAGES_REPO_SECRET_NAME);
     replaceStringInFile(operatorYamlDestFile.toString(),
-        "container-registry.oracle.com/database/operator:0.2.1", DB_OPERATOR_IMAGE);
+        "container-registry.oracle.com/database/operator:1.0.0", DB_OPERATOR_IMAGE);
     replaceStringInFile(operatorYamlDestFile.toString(), "imagePullPolicy: Always", "imagePullPolicy: IfNotPresent");
     createTestRepoSecret(namespace);
     createBaseRepoSecret(namespace);
@@ -876,7 +876,7 @@ public static String createOracleDBUsingOperator(String dbName, String sysPasswo
 
     ConditionFactory withLongRetryPolicy = with().pollDelay(2, SECONDS)
         .and().with().pollInterval(10, SECONDS)
-        .atMost(25, MINUTES).await();
+        .atMost(40, MINUTES).await();
 
     // wait for the pod to be ready
     logger.info("Wait for the database {0} pod to be ready in namespace {1}", dbName, namespace);

integration-tests/src/test/resources/dboperator/oracle-database-operator.yaml

@@ -853,6 +853,135 @@ status:
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.6.1
+  creationTimestamp: null
+  name: dataguardbrokers.database.oracle.com
+spec:
+  group: database.oracle.com
+  names:
+    kind: DataguardBroker
+    listKind: DataguardBrokerList
+    plural: dataguardbrokers
+    singular: dataguardbroker
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.primaryDatabase
+      name: Primary
+      type: string
+    - jsonPath: .status.standbyDatabases
+      name: Standbys
+      type: string
+    - jsonPath: .spec.protectionMode
+      name: Protection Mode
+      type: string
+    - jsonPath: .status.clusterConnectString
+      name: Cluster Connect Str
+      priority: 1
+      type: string
+    - jsonPath: .status.externalConnectString
+      name: Connect Str
+      type: string
+    - jsonPath: .spec.primaryDatabaseRef
+      name: Primary Database
+      priority: 1
+      type: string
+    - jsonPath: .status.status
+      name: Status
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: DataguardBroker is the Schema for the dataguardbrokers API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: DataguardBrokerSpec defines the desired state of DataguardBroker
+            properties:
+              fastStartFailOver:
+                properties:
+                  enable:
+                    type: boolean
+                  strategy:
+                    items:
+                      description: FSFO strategy
+                      properties:
+                        sourceDatabaseRef:
+                          type: string
+                        targetDatabaseRefs:
+                          type: string
+                      type: object
+                    type: array
+                type: object
+              loadBalancer:
+                type: boolean
+              nodeSelector:
+                additionalProperties:
+                  type: string
+                type: object
+              primaryDatabaseRef:
+                type: string
+              protectionMode:
+                enum:
+                - MaxPerformance
+                - MaxAvailability
+                type: string
+              serviceAnnotations:
+                additionalProperties:
+                  type: string
+                type: object
+              setAsPrimaryDatabase:
+                type: string
+              standbyDatabaseRefs:
+                items:
+                  type: string
+                type: array
+            required:
+            - primaryDatabaseRef
+            - protectionMode
+            - standbyDatabaseRefs
+            type: object
+          status:
+            description: DataguardBrokerStatus defines the observed state of DataguardBroker
+            properties:
+              clusterConnectString:
+                type: string
+              externalConnectString:
+                type: string
+              primaryDatabase:
+                type: string
+              primaryDatabaseRef:
+                type: string
+              protectionMode:
+                type: string
+              standbyDatabases:
+                type: string
+              status:
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.6.1
@@ -1915,7 +2044,7 @@ spec:
                 type: object
               conditions:
                 items:
-                  description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, type FooStatus struct{     // Represents the observations of a foo's current state.     // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"     // +patchMergeKey=type     // +patchStrategy=merge     // +listType=map     // +listMapKey=type     Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n     // other fields }"
+                  description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, \n \ttype FooStatus struct{ \t    // Represents the observations of a foo's current state. \t    // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" \t    // +patchMergeKey=type \t    // +patchStrategy=merge \t    // +listType=map \t    // +listMapKey=type \t    Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n \t    // other fields \t}"
                   properties:
                     lastTransitionTime:
                       description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
@@ -2015,26 +2144,29 @@ spec:
     - jsonPath: .status.edition
       name: Edition
       type: string
+    - jsonPath: .status.sid
+      name: Sid
+      priority: 1
+      type: string
     - jsonPath: .status.status
       name: Status
       type: string
     - jsonPath: .status.role
       name: Role
-      priority: 1
       type: string
     - jsonPath: .status.releaseUpdate
       name: Version
       type: string
     - jsonPath: .status.connectString
       name: Connect Str
       type: string
-    - jsonPath: .status.tcpsConnectString
-      name: TCPS Connect Str
-      type: string
     - jsonPath: .status.pdbConnectString
       name: Pdb Connect Str
       priority: 1
       type: string
+    - jsonPath: .status.tcpsConnectString
+      name: TCPS Connect Str
+      type: string
     - jsonPath: .status.tcpsPdbConnectString
       name: TCPS Pdb Connect Str
       priority: 1
@@ -2077,11 +2209,16 @@ spec:
                 type: string
               cloneFrom:
                 type: string
+              createAsStandby:
+                type: boolean
+              dgBrokerConfigured:
+                type: boolean
               edition:
                 enum:
                 - standard
                 - enterprise
                 - express
+                - free
                 type: string
               enableTCPS:
                 type: boolean
@@ -2142,6 +2279,8 @@ spec:
                   volumeName:
                     type: string
                 type: object
+              primaryDatabaseRef:
+                type: string
               readinessCheckPeriod:
                 type: integer
               replicas:
@@ -2185,7 +2324,7 @@ spec:
                 type: string
               conditions:
                 items:
-                  description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, type FooStatus struct{     // Represents the observations of a foo's current state.     // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"     // +patchMergeKey=type     // +patchStrategy=merge     // +listType=map     // +listMapKey=type     Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n     // other fields }"
+                  description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, \n \ttype FooStatus struct{ \t    // Represents the observations of a foo's current state. \t    // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" \t    // +patchMergeKey=type \t    // +patchStrategy=merge \t    // +listType=map \t    // +listMapKey=type \t    Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n \t    // other fields \t}"
                   properties:
                     lastTransitionTime:
                       description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
@@ -2237,6 +2376,8 @@ spec:
               datafilesPatched:
                 default: "false"
                 type: string
+              dgBrokerConfigured:
+                type: boolean
               edition:
                 type: string
               flashBack:
@@ -2293,6 +2434,8 @@ spec:
                 type: object
               prebuiltDB:
                 type: boolean
+              primaryDatabase:
+                type: string
               releaseUpdate:
                 type: string
               replicas:
@@ -2636,6 +2779,32 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - database.oracle.com
+  resources:
+  - dataguardbrokers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - database.oracle.com
+  resources:
+  - dataguardbrokers/finalizers
+  verbs:
+  - update
+- apiGroups:
+  - database.oracle.com
+  resources:
+  - dataguardbrokers/status
+  verbs:
+  - get
+  - patch
+  - update
 - apiGroups:
   - database.oracle.com
   resources:
@@ -2965,6 +3134,27 @@ webhooks:
     resources:
     - cdbs
   sideEffects: None
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
+    service:
+      name: oracle-database-operator-webhook-service
+      namespace: oracle-database-operator-system
+      path: /mutate-database-oracle-com-v1alpha1-dataguardbroker
+  failurePolicy: Fail
+  name: mdataguardbroker.kb.io
+  rules:
+  - apiGroups:
+    - database.oracle.com
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - dataguardbrokers
+  sideEffects: None
 - admissionReviewVersions:
   - v1
   - v1beta1
@@ -3137,6 +3327,27 @@ webhooks:
     resources:
     - cdbs
   sideEffects: None
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
+    service:
+      name: oracle-database-operator-webhook-service
+      namespace: oracle-database-operator-system
+      path: /validate-database-oracle-com-v1alpha1-dataguardbroker
+  failurePolicy: Fail
+  name: vdataguardbroker.kb.io
+  rules:
+  - apiGroups:
+    - database.oracle.com
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - dataguardbrokers
+  sideEffects: None
 - admissionReviewVersions:
   - v1
   - v1beta1
@@ -3224,7 +3435,7 @@ spec:
         - --enable-leader-election
         command:
         - /manager
-        image: container-registry.oracle.com/database/operator:0.2.1
+        image: container-registry.oracle.com/database/operator:1.0.0
         imagePullPolicy: Always
         name: manager
         ports:
@@ -3248,4 +3459,4 @@ spec:
         secret:
           defaultMode: 420
           secretName: webhook-server-cert
----
+---