|
24 | 24 | import io.kubernetes.client.models.V1beta1JSONSchemaProps; |
25 | 25 | import oracle.kubernetes.json.SchemaGenerator; |
26 | 26 | import oracle.kubernetes.operator.KubernetesConstants; |
27 | | -import oracle.kubernetes.operator.LabelConstants; |
28 | 27 | import oracle.kubernetes.operator.calls.CallResponse; |
29 | 28 | import oracle.kubernetes.operator.logging.LoggingFacade; |
30 | 29 | import oracle.kubernetes.operator.logging.LoggingFactory; |
|
36 | 35 | import oracle.kubernetes.weblogic.domain.model.DomainSpec; |
37 | 36 | import oracle.kubernetes.weblogic.domain.model.DomainStatus; |
38 | 37 |
|
39 | | -import static oracle.kubernetes.operator.VersionConstants.DEFAULT_OPERATOR_VERSION; |
40 | | - |
41 | 38 | /** Helper class to ensure Domain CRD is created. */ |
42 | 39 | public class CrdHelper { |
43 | 40 | private static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator"); |
@@ -114,8 +111,7 @@ static V1beta1CustomResourceDefinition createModel(KubernetesVersion version) { |
114 | 111 |
|
115 | 112 | static V1ObjectMeta createMetadata() { |
116 | 113 | return new V1ObjectMeta() |
117 | | - .name(KubernetesConstants.CRD_NAME) |
118 | | - .putLabelsItem(LabelConstants.RESOURCE_VERSION_LABEL, DEFAULT_OPERATOR_VERSION); |
| 114 | + .name(KubernetesConstants.CRD_NAME); |
119 | 115 | } |
120 | 116 |
|
121 | 117 | static V1beta1CustomResourceDefinitionSpec createSpec(KubernetesVersion version) { |
@@ -347,8 +343,6 @@ public boolean isOutdatedCrd( |
347 | 343 | return getSchemaValidation(actual) == null |
348 | 344 | || !getSchemaValidation(expected).equals(getSchemaValidation(actual)) |
349 | 345 | || !getSchemaSubresources(expected).equals(getSchemaSubresources(actual)); |
350 | | - // Similarly, we will later want to check: |
351 | | - // VersionHelper.matchesResourceVersion(existingCRD.getMetadata(), DEFAULT_OPERATOR_VERSION) |
352 | 346 | } |
353 | 347 |
|
354 | 348 | // true, if version is later than base |
|
0 commit comments