Skip to content

Commit 74fcc88

Browse files
xiancaorjeberhard
xiancao
and
rjeberhard
authored
fix crio-pipeline configmap already existing issue when creating in release/3.4 (#2970)
Co-authored-by: Ryan Eberhard <ryan.eberhard@oracle.com>
1 parent 3023b3f commit 74fcc88

23 files changed

+122
-81
lines changed

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItConfigDistributionStrategy.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
import static oracle.weblogic.kubernetes.utils.BuildApplication.buildApplication;
8585
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
8686
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
87+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
8788
import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapForDomainCreation;
8889
import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapFromFiles;
8990
import static oracle.weblogic.kubernetes.utils.DeployUtil.deployUsingWlst;
@@ -95,7 +96,6 @@
9596
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
9697
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPV;
9798
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPVC;
98-
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.getUniquePvOrPvcName;
9999
import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodDoesNotExist;
100100
import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodExists;
101101
import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodReady;
@@ -131,8 +131,8 @@ class ItConfigDistributionStrategy {
131131
final String managedServerNameBase = "ms-";
132132
final int managedServerPort = 8001;
133133
int t3ChannelPort;
134-
final String pvName = getUniquePvOrPvcName(domainUid + "-pv-");
135-
final String pvcName = getUniquePvOrPvcName(domainUid + "-pvc-");
134+
final String pvName = getUniqueName(domainUid + "-pv-");
135+
final String pvcName = getUniqueName(domainUid + "-pvc-");
136136
final String wlSecretName = "weblogic-credentials";
137137
final String managedServerPodNamePrefix = domainUid + "-" + managedServerNameBase;
138138
int replicaCount = 2;

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import static oracle.weblogic.kubernetes.actions.ActionConstants.WDT_VERSION;
3838
import static oracle.weblogic.kubernetes.actions.impl.primitive.Docker.getImageEnvVar;
3939
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
40+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
4041
import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapForDomainCreation;
4142
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSecretWithUsernamePassword;
4243
import static oracle.weblogic.kubernetes.utils.DbUtils.setupDBandRCUschema;
@@ -48,7 +49,6 @@
4849
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
4950
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPV;
5051
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPVC;
51-
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.getUniquePvOrPvcName;
5252
import static oracle.weblogic.kubernetes.utils.PodUtils.setPodAntiAffinity;
5353
import static oracle.weblogic.kubernetes.utils.SecretUtils.createSecretWithUsernamePassword;
5454
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
@@ -155,8 +155,8 @@ RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
155155
@Test
156156
@DisplayName("Create a FMW domainon on PV using WDT")
157157
void testFmwDomainOnPVUsingWdt() {
158-
final String pvName = getUniquePvOrPvcName(domainUid + "-pv-");
159-
final String pvcName = getUniquePvOrPvcName(domainUid + "-pvc-");
158+
final String pvName = getUniqueName(domainUid + "-pv-");
159+
final String pvcName = getUniqueName(domainUid + "-pvc-");
160160
final int t3ChannelPort = getNextFreePort();
161161

162162
// create FMW domain credential secret

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWLST.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import static oracle.weblogic.kubernetes.actions.impl.primitive.Docker.getImageEnvVar;
4949
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
5050
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
51+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
5152
import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapForDomainCreation;
5253
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSecretWithUsernamePassword;
5354
import static oracle.weblogic.kubernetes.utils.DbUtils.setupDBandRCUschema;
@@ -57,7 +58,6 @@
5758
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
5859
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPV;
5960
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPVC;
60-
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.getUniquePvOrPvcName;
6161
import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodReady;
6262
import static oracle.weblogic.kubernetes.utils.PodUtils.setPodAntiAffinity;
6363
import static oracle.weblogic.kubernetes.utils.SecretUtils.createSecretWithUsernamePassword;
@@ -160,8 +160,8 @@ void testFmwDomainInPvUsingWlst() {
160160
final int replicaCount = 2;
161161
final int t3ChannelPort = getNextFreePort();
162162

163-
final String pvName = getUniquePvOrPvcName(domainUid + "-pv-");
164-
final String pvcName = getUniquePvOrPvcName(domainUid + "-pvc-");
163+
final String pvName = getUniqueName(domainUid + "-pv-");
164+
final String pvcName = getUniqueName(domainUid + "-pvc-");
165165

166166
// create pull secrets for jrfDomainNamespace when running in non Kind Kubernetes cluster
167167
// this secret is used only for non-kind cluster

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicDomainInPV.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import static oracle.weblogic.kubernetes.utils.ApplicationUtils.callWebAppAndWaitTillReady;
5151
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
5252
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
53+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
5354
import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapForDomainCreation;
5455
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSecretWithUsernamePassword;
5556
import static oracle.weblogic.kubernetes.utils.DbUtils.setupDBandRCUschema;
@@ -59,7 +60,6 @@
5960
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
6061
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPV;
6162
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPVC;
62-
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.getUniquePvOrPvcName;
6363
import static oracle.weblogic.kubernetes.utils.PodUtils.getExternalServicePodName;
6464
import static oracle.weblogic.kubernetes.utils.PodUtils.setPodAntiAffinity;
6565
import static oracle.weblogic.kubernetes.utils.SecretUtils.createSecretWithUsernamePassword;
@@ -163,8 +163,8 @@ void testFmwDynamicDomainInPV() {
163163
}
164164

165165
private void createFmwDomainAndVerify() {
166-
final String pvName = getUniquePvOrPvcName(domainUid + "-pv-");
167-
final String pvcName = getUniquePvOrPvcName(domainUid + "-pvc-");
166+
final String pvName = getUniqueName(domainUid + "-pv-");
167+
final String pvcName = getUniqueName(domainUid + "-pvc-");
168168
final int t3ChannelPort = getNextFreePort();
169169

170170
// create pull secrets for domainNamespace when running in non Kind Kubernetes cluster

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
import static oracle.weblogic.kubernetes.utils.CommonMiiTestUtils.verifyPodsNotRolled;
8989
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
9090
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
91+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
9192
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
9293
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.verifyCredentials;
9394
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.verifyServerCommunication;
@@ -106,7 +107,6 @@
106107
import static oracle.weblogic.kubernetes.utils.PatchDomainUtils.patchDomainResource;
107108
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPV;
108109
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPVC;
109-
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.getUniquePvOrPvcName;
110110
import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodDoesNotExist;
111111
import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodExists;
112112
import static oracle.weblogic.kubernetes.utils.PodUtils.getExternalServicePodName;
@@ -156,8 +156,8 @@ class ItIntrospectVersion {
156156

157157
private static final int t3ChannelPort = getNextFreePort();
158158

159-
private static final String pvName = getUniquePvOrPvcName(domainUid + "-pv-");
160-
private static final String pvcName = getUniquePvOrPvcName(domainUid + "-pvc-");
159+
private static final String pvName = getUniqueName(domainUid + "-pv-");
160+
private static final String pvcName = getUniqueName(domainUid + "-pvc-");
161161

162162
private static final String wlSecretName = "weblogic-credentials";
163163
private static String wlsUserName = ADMIN_USERNAME_DEFAULT;

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioDomainInPV.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import static oracle.weblogic.kubernetes.utils.ApplicationUtils.checkAppUsingHostHeader;
5656
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
5757
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
58+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
5859
import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapForDomainCreation;
5960
import static oracle.weblogic.kubernetes.utils.DeployUtil.deployToClusterUsingRest;
6061
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
@@ -69,7 +70,6 @@
6970
import static oracle.weblogic.kubernetes.utils.PatchDomainUtils.patchServerStartPolicy;
7071
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPV;
7172
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPVC;
72-
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.getUniquePvOrPvcName;
7373
import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodDeleted;
7474
import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodReady;
7575
import static oracle.weblogic.kubernetes.utils.PodUtils.setPodAntiAffinity;
@@ -153,8 +153,8 @@ void testIstioDomainHomeInPv() {
153153
final int replicaCount = 2;
154154
final int t3ChannelPort = getNextFreePort();
155155

156-
final String pvName = getUniquePvOrPvcName(domainUid + "-pv-");
157-
final String pvcName = getUniquePvOrPvcName(domainUid + "-pvc-");
156+
final String pvName = getUniqueName(domainUid + "-pv-");
157+
final String pvcName = getUniqueName(domainUid + "-pvc-");
158158

159159
// create pull secrets for WebLogic image when running in non Kind Kubernetes cluster
160160
// this secret is used only for non-kind cluster

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesEvents.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
7777
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
7878
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
79+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
7980
import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapForDomainCreation;
8081
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
8182
import static oracle.weblogic.kubernetes.utils.ImageUtils.createSecretForBaseImages;
@@ -108,7 +109,6 @@
108109
import static oracle.weblogic.kubernetes.utils.PatchDomainUtils.patchDomainResource;
109110
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPV;
110111
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPVC;
111-
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.getUniquePvOrPvcName;
112112
import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodDoesNotExist;
113113
import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodExists;
114114
import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodReady;
@@ -159,8 +159,8 @@ class ItKubernetesEvents {
159159
final int managedServerPort = 8001;
160160
int replicaCount = 2;
161161

162-
final String pvName = getUniquePvOrPvcName(domainUid + "-pv-");
163-
final String pvcName = getUniquePvOrPvcName(domainUid + "-pvc-");
162+
final String pvName = getUniqueName(domainUid + "-pv-");
163+
final String pvcName = getUniqueName(domainUid + "-pvc-");
164164
private final String wlSecretName = "weblogic-credentials";
165165

166166
// create standard, reusable retry/backoff policy
@@ -509,8 +509,8 @@ void testDomainK8sEventsScaleBelowMin() {
509509
void testDomainK8sEventsProcessingFailed() {
510510
OffsetDateTime timestamp = now();
511511
try {
512-
String pvName = getUniquePvOrPvcName("sample-pv-");
513-
String pvcName = getUniquePvOrPvcName("sample-pvc-");
512+
String pvName = getUniqueName("sample-pv-");
513+
String pvcName = getUniqueName("sample-pvc-");
514514
createPV(pvName, domainUid, this.getClass().getSimpleName());
515515
createPVC(pvName, pvcName, domainUid, domainNamespace1);
516516
String introspectVersion = assertDoesNotThrow(() -> getNextIntrospectVersion(domainUid, domainNamespace1));

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItLBTwoDomainsApache.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
import static oracle.weblogic.kubernetes.utils.CommonLBTestUtils.createMultipleDomainsSharingPVUsingWlstAndVerify;
4646
import static oracle.weblogic.kubernetes.utils.CommonLBTestUtils.verifyClusterLoadbalancing;
4747
import static oracle.weblogic.kubernetes.utils.CommonMiiTestUtils.createMiiDomainAndVerify;
48+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
4849
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
4950
import static oracle.weblogic.kubernetes.utils.ImageUtils.createSecretForBaseImages;
5051
import static oracle.weblogic.kubernetes.utils.LoadBalancerUtils.installAndVerifyApache;
5152
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
5253
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPVPVCAndVerify;
53-
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.getUniquePvOrPvcName;
5454
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
5555
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
5656
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -69,8 +69,8 @@ class ItLBTwoDomainsApache {
6969

7070
private static final int numberOfDomains = 2;
7171
private static final String wlSecretName = "weblogic-credentials";
72-
private static final String apachePvcName = getUniquePvOrPvcName("apache-custom-file-pvc");
73-
private static final String apachePvName = getUniquePvOrPvcName("apache-custom-file-pv");
72+
private static final String apachePvcName = getUniqueName("apache-custom-file-pvc");
73+
private static final String apachePvName = getUniqueName("apache-custom-file-pv");
7474

7575
private static List<String> domainUids = new ArrayList<>();
7676
private static String miiDomainUid = null;

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiCustomSslStore.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import static oracle.weblogic.kubernetes.utils.CommonMiiTestUtils.createDomainSecret;
3434
import static oracle.weblogic.kubernetes.utils.CommonMiiTestUtils.createJobToChangePermissionsOnPvHostPath;
3535
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
36+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
3637
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.runClientInsidePod;
3738
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.runJavacInsidePod;
3839
import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapAndVerify;
@@ -42,7 +43,6 @@
4243
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
4344
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPV;
4445
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPVC;
45-
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.getUniquePvOrPvcName;
4646
import static oracle.weblogic.kubernetes.utils.SslUtils.generateJksStores;
4747
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
4848
import static org.awaitility.Awaitility.with;
@@ -74,8 +74,8 @@ class ItMiiCustomSslStore {
7474
private static ConditionFactory withStandardRetryPolicy = null;
7575
private static int replicaCount = 2;
7676
private static final String domainUid = "mii-custom-ssl";
77-
private static final String pvName = getUniquePvOrPvcName(domainUid + "-pv-");
78-
private static final String pvcName = getUniquePvOrPvcName(domainUid + "-pvc-");
77+
private static final String pvName = getUniqueName(domainUid + "-pv-");
78+
private static final String pvcName = getUniqueName(domainUid + "-pvc-");
7979
private static final String adminServerPodName = domainUid + "-admin-server";
8080
private static final String managedServerPrefix = domainUid + "-managed-server";
8181
private static LoggingFacade logger = null;

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDomainModelInPV.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
6969
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getDateAndTimeStamp;
7070
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getHostAndPort;
71+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
7172
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
7273
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
7374
import static oracle.weblogic.kubernetes.utils.FileUtils.checkDirectory;
@@ -79,7 +80,6 @@
7980
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPV;
8081
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPVC;
8182
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createfixPVCOwnerContainer;
82-
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.getUniquePvOrPvcName;
8383
import static oracle.weblogic.kubernetes.utils.PodUtils.execInPod;
8484
import static oracle.weblogic.kubernetes.utils.PodUtils.getExternalServicePodName;
8585
import static oracle.weblogic.kubernetes.utils.SecretUtils.createSecretWithUsernamePassword;
@@ -114,8 +114,8 @@ public class ItMiiDomainModelInPV {
114114
private static String adminSecretName;
115115
private static String encryptionSecretName;
116116

117-
private static final String pvName = getUniquePvOrPvcName(domainUid1 + "-wdtmodel-pv-");
118-
private static final String pvcName = getUniquePvOrPvcName(domainUid1 + "-wdtmodel-pvc-");
117+
private static final String pvName = getUniqueName(domainUid1 + "-wdtmodel-pv-");
118+
private static final String pvcName = getUniqueName(domainUid1 + "-wdtmodel-pvc-");
119119

120120
private static Path clusterViewAppPath;
121121
private static String modelFile = "modelinpv-with-war.yaml";

0 commit comments

Comments
 (0)