File tree Expand file tree Collapse file tree 6 files changed +22
-3
lines changed
main/java/oracle/kubernetes/operator
test/java/oracle/kubernetes/operator/create Expand file tree Collapse file tree 6 files changed +22
-3
lines changed Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ metadata:
4
4
name : %DOMAIN_UID%-voyager
5
5
namespace : %NAMESPACE%
6
6
labels :
7
+ weblogic.resourceVersion : voyager-load-balancer/v1
7
8
weblogic.domainUID : %DOMAIN_UID%
8
9
weblogic.domainName : %DOMAIN_NAME%
9
10
annotations :
@@ -27,6 +28,7 @@ metadata:
27
28
namespace : %NAMESPACE%
28
29
labels :
29
30
app : %DOMAIN_UID%-voyager-stats
31
+ weblogic.resourceVersion : voyager-load-balancer/v1
30
32
weblogic.domainUID : %DOMAIN_UID%
31
33
weblogic.domainName : %DOMAIN_NAME%
32
34
spec :
Original file line number Diff line number Diff line change 5
5
6
6
public interface LabelConstants {
7
7
8
+ public static final String RESOURCE_VERSION_LABEL = "weblogic.resourceVersion" ;
8
9
public static final String DOMAINUID_LABEL = "weblogic.domainUID" ;
9
10
public static final String DOMAINNAME_LABEL = "weblogic.domainName" ;
10
11
public static final String SERVERNAME_LABEL = "weblogic.serverName" ;
Original file line number Diff line number Diff line change
1
+ // Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
2
+ // Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
3
+
4
+ package oracle .kubernetes .operator ;
5
+
6
+ public interface VersionConstants {
7
+ public static final String CREATE_WEBLOGIC_OPERATOR_INPUTS_V1 = "create-weblogic-operator-inputs/v1" ;
8
+ public static final String CREATE_WEBLOGIC_DOMAIN_INPUTS_V1 = "create-weblogic-domain-inputs/v1" ;
9
+ public static final String OPERATOR_V1 = "operator/v1" ;
10
+ public static final String DOMAIN_V1 = "domain/v1" ;
11
+ public static final String VOYAGER_LOAD_BALANCER_V1 = "voyager-load-balancer/v1" ;
12
+ public static final String APACHE_LOAD_BALANCER_V1 = "apache-load-balancer/v1" ;
13
+ public static final String TRAEFIK_LOAD_BALANCER_V1 = "traefik-load-balancer/v1" ;
14
+ }
Original file line number Diff line number Diff line change 10
10
import org .junit .After ;
11
11
import org .junit .Before ;
12
12
import org .junit .Test ;
13
+ import static oracle .kubernetes .operator .VersionConstants .*;
13
14
import static oracle .kubernetes .operator .create .CreateDomainInputs .*;
14
15
import static oracle .kubernetes .operator .create .ExecCreateDomain .*;
15
16
import static oracle .kubernetes .operator .create .ExecResultMatcher .*;
@@ -43,6 +44,7 @@ public void defaultInputsFile_hasCorrectContents() throws Exception {
43
44
assertThat (
44
45
readDefaultInputsFile (),
45
46
yamlEqualTo ((new CreateDomainInputs ())
47
+ .version (CREATE_WEBLOGIC_DOMAIN_INPUTS_V1 )
46
48
.adminNodePort ("30701" )
47
49
.adminPort ("7001" )
48
50
.adminServerName ("admin-server" )
Original file line number Diff line number Diff line change 11
11
import java .nio .file .Path ;
12
12
import java .util .List ;
13
13
14
+ import static oracle .kubernetes .operator .VersionConstants .*;
14
15
import static oracle .kubernetes .operator .create .CreateOperatorInputs .*;
15
16
import static oracle .kubernetes .operator .create .ExecCreateOperator .execCreateOperator ;
16
17
import static oracle .kubernetes .operator .create .ExecResultMatcher .succeedsAndPrints ;
@@ -46,6 +47,7 @@ public void defaultInputsFile_hasCorrectContents() throws Exception {
46
47
assertThat (
47
48
readDefaultInputsFile (),
48
49
yamlEqualTo ((new CreateOperatorInputs ())
50
+ .version (CREATE_WEBLOGIC_OPERATOR_INPUTS_V1 )
49
51
.elkIntegrationEnabled ("false" )
50
52
.externalDebugHttpPort ("30999" )
51
53
.externalOperatorCert ("" )
Original file line number Diff line number Diff line change 7
7
import org .junit .Before ;
8
8
import org .junit .Test ;
9
9
10
+ import static oracle .kubernetes .operator .create .CreateOperatorInputs .*;
10
11
import static oracle .kubernetes .operator .create .ExecResultMatcher .errorRegexp ;
11
12
import static oracle .kubernetes .operator .create .ExecResultMatcher .failsAndPrints ;
12
13
import static org .hamcrest .MatcherAssert .assertThat ;
13
14
14
- import static oracle .kubernetes .operator .create .CreateOperatorInputs .*;
15
15
16
16
/**
17
17
* Tests that create-weblogic-operator.sh properly validates the parameters
@@ -51,8 +51,6 @@ public void tearDown() throws Exception {
51
51
private static final String PARAM_JAVA_LOGGING_LEVEL = "javaLoggingLevel" ;
52
52
private static final String PARAM_ELK_INTEGRATION_ENABLED = "elkIntegrationEnabled" ;
53
53
54
- private static final String VERSION_V1 = "create-weblogic-operator-inputs/v1" ;
55
-
56
54
@ Test
57
55
public void createOperator_with_missingVersion_failsAndReturnsError () throws Exception {
58
56
assertThat (
You can’t perform that action at this time.
0 commit comments