Skip to content

Commit d9d3d28

Browse files
committed
Update CRD version
1 parent 96a8fde commit d9d3d28

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

kubernetes/samples/scripts/common/domain-template.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# Copyright 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
2-
32
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
43
#
54
# This is an example of how to define a Domain resource.
65
#
7-
apiVersion: "weblogic.oracle/v3"
6+
apiVersion: "weblogic.oracle/v4"
87
kind: Domain
98
metadata:
109
name: %DOMAIN_UID%

kubernetes/samples/scripts/create-weblogic-domain/manually-create-domain/domain.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
# Copyright 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
2-
32
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
43
#
54
# This is an example of how to define a Domain resource. Please read through the comments which explain
65
# what updates are needed.
76
#
8-
apiVersion: "weblogic.oracle/v3"
7+
apiVersion: "weblogic.oracle/v4"
98
kind: Domain
109
metadata:
1110
# Update this with the `domainUID` of your domain:

model/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2017, 2018, Oracle Corporation and/or its affiliates. All rights reserved.
1+
// Copyright 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
22
// Licensed under the Universal Permissive License v 1.0 as shown at
33
// http://oss.oracle.com/licenses/upl.
44

@@ -22,8 +22,8 @@ public interface KubernetesConstants {
2222
String DOMAIN_PLURAL = "domains";
2323
String DOMAIN_SINGULAR = "domain";
2424
String DOMAIN_SHORT = "dom";
25-
String DOMAIN_VERSION = "v3";
26-
String[] DOMAIN_ALTERNATE_VERSIONS = {"v2"};
25+
String DOMAIN_VERSION = "v4";
26+
String[] DOMAIN_ALTERNATE_VERSIONS = {"v2", "v3"};
2727

2828
boolean DEFAULT_INCLUDE_SERVER_OUT_IN_POD_LOG = true;
2929

operator/src/test/java/oracle/kubernetes/operator/helpers/CRDHelperTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
1+
// Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
22
// Licensed under the Universal Permissive License v 1.0 as shown at
33
// http://oss.oracle.com/licenses/upl.
44

@@ -146,7 +146,7 @@ public void whenExistingCRDHasOldVersion_replaceIt() {
146146

147147
@Test
148148
public void whenExistingCRDHasFutureVersion_dontReplaceIt() {
149-
V1beta1CustomResourceDefinition existing = defineCRD("v4", "operator-v4");
149+
V1beta1CustomResourceDefinition existing = defineCRD("v500", "operator-v500");
150150
existing
151151
.getSpec()
152152
.addVersionsItem(
@@ -160,9 +160,9 @@ public void whenExistingCRDHasFutureVersion_dontReplaceIt() {
160160

161161
@Test
162162
public void whenExistingCRDHasFutureVersionButNotCurrentStorage_updateIt() {
163-
expectReadCRD().returning(defineCRD("v4", "operator-v4"));
163+
expectReadCRD().returning(defineCRD("v500", "operator-v500"));
164164

165-
V1beta1CustomResourceDefinition replacement = defineCRD("v4", "operator-v4");
165+
V1beta1CustomResourceDefinition replacement = defineCRD("v500", "operator-v500");
166166
replacement
167167
.getSpec()
168168
.addVersionsItem(

0 commit comments

Comments
 (0)