Skip to content

Commit f8a3965

Browse files
committed
Version the domain and load balancer resources
1 parent 5d9906f commit f8a3965

13 files changed

+54
-10
lines changed

kubernetes/internal/create-weblogic-domain-job-template.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
name: %DOMAIN_UID%-create-weblogic-domain-job-cm
77
namespace: %NAMESPACE%
88
labels:
9+
weblogic.resourceVersion: domain/v1
910
weblogic.domainUID: %DOMAIN_UID%
1011
weblogic.domainName: %DOMAIN_NAME%
1112
data:
@@ -266,6 +267,7 @@ spec:
266267
template:
267268
metadata:
268269
labels:
270+
weblogic.resourceVersion: domain/v1
269271
weblogic.domainUID: %DOMAIN_UID%
270272
weblogic.domainName: %DOMAIN_NAME%
271273
app: %DOMAIN_UID%-create-weblogic-domain-job

kubernetes/internal/domain-custom-resource-template.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ metadata:
99
name: %DOMAIN_UID%
1010
namespace: %NAMESPACE%
1111
labels:
12+
weblogic.resourceVersion: domain/v1
1213
weblogic.domainUID: %DOMAIN_UID%
1314
weblogic.domainName: %DOMAIN_NAME%
1415
spec:

kubernetes/internal/weblogic-domain-apache-security-template.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
44
metadata:
55
name: %DOMAIN_UID%-apache-webtier
66
labels:
7+
weblogic.resourceVersion: apache-load-balancer/v1
78
weblogic.domainUID: %DOMAIN_UID%
89
weblogic.domainName: %DOMAIN_NAME%
910
rules:
@@ -32,6 +33,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
3233
metadata:
3334
name: %DOMAIN_UID%-apache-webtier
3435
labels:
36+
weblogic.resourceVersion: apache-load-balancer/v1
3537
weblogic.domainUID: %DOMAIN_UID%
3638
weblogic.domainName: %DOMAIN_NAME%
3739
roleRef:

kubernetes/internal/weblogic-domain-apache-template.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
name: %DOMAIN_UID%-apache-webtier
66
namespace: %NAMESPACE%
77
labels:
8+
weblogic.resourceVersion: apache-load-balancer/v1
89
weblogic.domainUID: %DOMAIN_UID%
910
weblogic.domainName: %DOMAIN_NAME%
1011
app: apache-webtier
@@ -15,6 +16,7 @@ metadata:
1516
name: %DOMAIN_UID%-apache-webtier
1617
namespace: %NAMESPACE%
1718
labels:
19+
weblogic.resourceVersion: apache-load-balancer/v1
1820
weblogic.domainUID: %DOMAIN_UID%
1921
weblogic.domainName: %DOMAIN_NAME%
2022
app: apache-webtier
@@ -78,6 +80,7 @@ metadata:
7880
name: %DOMAIN_UID%-apache-webtier
7981
namespace: %NAMESPACE%
8082
labels:
83+
weblogic.resourceVersion: apache-load-balancer/v1
8184
weblogic.domainUID: %DOMAIN_UID%
8285
weblogic.domainName: %DOMAIN_NAME%
8386
spec:

kubernetes/internal/weblogic-domain-pv-template.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ kind: PersistentVolume
66
metadata:
77
name: %DOMAIN_UID%-weblogic-domain-pv
88
labels:
9+
weblogic.resourceVersion: domain/v1
910
weblogic.domainUID: %DOMAIN_UID%
1011
weblogic.domainName: %DOMAIN_NAME%
1112
spec:

kubernetes/internal/weblogic-domain-pvc-template.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ metadata:
77
name: %DOMAIN_UID%-weblogic-domain-pvc
88
namespace: %NAMESPACE%
99
labels:
10+
weblogic.resourceVersion: domain/v1
1011
weblogic.domainUID: %DOMAIN_UID%
1112
weblogic.domainName: %DOMAIN_NAME%
1213
spec:

kubernetes/internal/weblogic-domain-traefik-security-template.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
44
metadata:
55
name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
66
labels:
7+
weblogic.resourceVersion: traefik-load-balancer/v1
78
weblogic.domainUID: %DOMAIN_UID%
89
weblogic.domainName: %DOMAIN_NAME%
910
weblogic.clusterName: %CLUSTER_NAME%
@@ -33,6 +34,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
3334
metadata:
3435
name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
3536
labels:
37+
weblogic.resourceVersion: traefik-load-balancer/v1
3638
weblogic.domainUID: %DOMAIN_UID%
3739
weblogic.domainName: %DOMAIN_NAME%
3840
weblogic.clusterName: %CLUSTER_NAME%

kubernetes/internal/weblogic-domain-traefik-template.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
66
namespace: %NAMESPACE%
77
labels:
8+
weblogic.resourceVersion: traefik-load-balancer/v1
89
weblogic.domainUID: %DOMAIN_UID%
910
weblogic.domainName: %DOMAIN_NAME%
1011
weblogic.clusterName: %CLUSTER_NAME%
@@ -15,6 +16,7 @@ metadata:
1516
name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
1617
namespace: %NAMESPACE%
1718
labels:
19+
weblogic.resourceVersion: traefik-load-balancer/v1
1820
weblogic.domainUID: %DOMAIN_UID%
1921
weblogic.domainName: %DOMAIN_NAME%
2022
weblogic.clusterName: %CLUSTER_NAME%
@@ -82,6 +84,7 @@ metadata:
8284
name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik-cm
8385
namespace: %NAMESPACE%
8486
labels:
87+
weblogic.resourceVersion: traefik-load-balancer/v1
8588
weblogic.domainUID: %DOMAIN_UID%
8689
weblogic.domainName: %DOMAIN_NAME%
8790
weblogic.clusterName: %CLUSTER_NAME%
@@ -105,6 +108,7 @@ metadata:
105108
name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
106109
namespace: %NAMESPACE%
107110
labels:
111+
weblogic.resourceVersion: traefik-load-balancer/v1
108112
weblogic.domainUID: %DOMAIN_UID%
109113
weblogic.domainName: %DOMAIN_NAME%
110114
weblogic.clusterName: %CLUSTER_NAME%
@@ -125,6 +129,7 @@ metadata:
125129
name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik-dashboard
126130
namespace: %NAMESPACE%
127131
labels:
132+
weblogic.resourceVersion: traefik-load-balancer/v1
128133
weblogic.domainUID: %DOMAIN_UID%
129134
weblogic.domainName: %DOMAIN_NAME%
130135
weblogic.clusterName: %CLUSTER_NAME%

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import io.kubernetes.client.models.V1ObjectMeta;
2525
import oracle.kubernetes.operator.KubernetesConstants;
2626
import oracle.kubernetes.operator.LabelConstants;
27+
import oracle.kubernetes.operator.VersionConstants;
2728
import oracle.kubernetes.operator.ProcessingConstants;
2829
import oracle.kubernetes.operator.logging.LoggingFacade;
2930
import oracle.kubernetes.operator.logging.LoggingFactory;
@@ -145,6 +146,7 @@ protected V1ConfigMap computeDomainConfigMap() {
145146
AnnotationHelper.annotateWithFormat(metadata);
146147

147148
Map<String, String> labels = new HashMap<>();
149+
labels.put(LabelConstants.RESOURCE_VERSION_LABEL, VersionConstants.DOMAIN_V1);
148150
labels.put(LabelConstants.OPERATORNAME_LABEL, operatorNamespace);
149151
labels.put(LabelConstants.CREATEDBYOPERATOR_LABEL, "true");
150152
metadata.setLabels(labels);

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import oracle.kubernetes.operator.DomainStatusUpdater;
2525
import oracle.kubernetes.operator.KubernetesConstants;
2626
import oracle.kubernetes.operator.LabelConstants;
27+
import oracle.kubernetes.operator.VersionConstants;
2728
import oracle.kubernetes.operator.PodWatcher;
2829
import oracle.kubernetes.operator.ProcessingConstants;
2930
import oracle.kubernetes.operator.TuningParameters;
@@ -188,6 +189,7 @@ protected V1Pod computeAdminPodConfig(TuningParameters configMapHelper, Packet p
188189
AnnotationHelper.annotateForPrometheus(metadata, spec.getAsPort());
189190

190191
Map<String, String> labels = new HashMap<>();
192+
labels.put(LabelConstants.RESOURCE_VERSION_LABEL, VersionConstants.DOMAIN_V1);
191193
labels.put(LabelConstants.DOMAINUID_LABEL, weblogicDomainUID);
192194
labels.put(LabelConstants.DOMAINNAME_LABEL, weblogicDomainName);
193195
labels.put(LabelConstants.SERVERNAME_LABEL, spec.getAsName());
@@ -615,6 +617,7 @@ protected V1Pod computeManagedPodConfig(TuningParameters configMapHelper, Packet
615617
AnnotationHelper.annotateForPrometheus(metadata, scan.getListenPort());
616618

617619
Map<String, String> labels = new HashMap<>();
620+
labels.put(LabelConstants.RESOURCE_VERSION_LABEL, VersionConstants.DOMAIN_V1);
618621
labels.put(LabelConstants.DOMAINUID_LABEL, weblogicDomainUID);
619622
labels.put(LabelConstants.DOMAINNAME_LABEL, weblogicDomainName);
620623
labels.put(LabelConstants.SERVERNAME_LABEL, weblogicServerName);

0 commit comments

Comments
 (0)