Skip to content

Commit 813b317

Browse files
committed
Remove unnecessary CRD label
1 parent 594417a commit 813b317

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/ItOperator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,8 @@ public void testAutoAndCustomSitConfigOverrides() throws Exception {
468468
domain11 = TestUtils.createDomain(domainMap);
469469
domain11.verifyDomainCreated();
470470
testBasicUseCases(domain11);
471-
// OWLS-76081 - commenting the below check as its not a generic usecase that works for all images, it needs wlthint3client.jar
471+
// OWLS-76081 - commenting the below check as its not a generic use case that works for all images,
472+
// it needs wlthint3client.jar
472473
// testAdminT3ChannelWithJms(domain11);
473474
testCompletedSuccessfully = true;
474475

operator/src/main/java/oracle/kubernetes/operator/helpers/CrdHelper.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import io.kubernetes.client.models.V1beta1JSONSchemaProps;
2525
import oracle.kubernetes.json.SchemaGenerator;
2626
import oracle.kubernetes.operator.KubernetesConstants;
27-
import oracle.kubernetes.operator.LabelConstants;
2827
import oracle.kubernetes.operator.calls.CallResponse;
2928
import oracle.kubernetes.operator.logging.LoggingFacade;
3029
import oracle.kubernetes.operator.logging.LoggingFactory;
@@ -36,8 +35,6 @@
3635
import oracle.kubernetes.weblogic.domain.model.DomainSpec;
3736
import oracle.kubernetes.weblogic.domain.model.DomainStatus;
3837

39-
import static oracle.kubernetes.operator.VersionConstants.DEFAULT_OPERATOR_VERSION;
40-
4138
/** Helper class to ensure Domain CRD is created. */
4239
public class CrdHelper {
4340
private static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
@@ -114,8 +111,7 @@ static V1beta1CustomResourceDefinition createModel(KubernetesVersion version) {
114111

115112
static V1ObjectMeta createMetadata() {
116113
return new V1ObjectMeta()
117-
.name(KubernetesConstants.CRD_NAME)
118-
.putLabelsItem(LabelConstants.RESOURCE_VERSION_LABEL, DEFAULT_OPERATOR_VERSION);
114+
.name(KubernetesConstants.CRD_NAME);
119115
}
120116

121117
static V1beta1CustomResourceDefinitionSpec createSpec(KubernetesVersion version) {
@@ -347,8 +343,6 @@ public boolean isOutdatedCrd(
347343
return getSchemaValidation(actual) == null
348344
|| !getSchemaValidation(expected).equals(getSchemaValidation(actual))
349345
|| !getSchemaSubresources(expected).equals(getSchemaSubresources(actual));
350-
// Similarly, we will later want to check:
351-
// VersionHelper.matchesResourceVersion(existingCRD.getMetadata(), DEFAULT_OPERATOR_VERSION)
352346
}
353347

354348
// true, if version is later than base

0 commit comments

Comments
 (0)