Skip to content

Commit 6043eb8

Browse files
moreautmoreaut
committed
Switch version strings from e.g. operator/v1 to operator-v1 since metadata labels are not allowed to include / characters
1 parent b0ae15c commit 6043eb8

16 files changed

+48
-48
lines changed

‎kubernetes/create-weblogic-domain-inputs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
33

44
# The version of this inputs file. Do not modify.
5-
version: create-weblogic-domain-inputs/v1
5+
version: create-weblogic-domain-inputs-v1
66

77
# Port number for admin server
88
adminPort: 7001

‎kubernetes/create-weblogic-operator-inputs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
33

44
# The version of this inputs file. Do not modify.
5-
version: create-weblogic-operator-inputs/v1
5+
version: create-weblogic-operator-inputs-v1
66

77
# The name of the service account that the operator will use to
88
# make requests to the Kubernetes API server.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: %DOMAIN_UID%-create-weblogic-domain-job-cm
77
namespace: %NAMESPACE%
88
labels:
9-
weblogic.resourceVersion: domain/v1
9+
weblogic.resourceVersion: domain-v1
1010
weblogic.domainUID: %DOMAIN_UID%
1111
weblogic.domainName: %DOMAIN_NAME%
1212
data:
@@ -267,7 +267,7 @@ spec:
267267
template:
268268
metadata:
269269
labels:
270-
weblogic.resourceVersion: domain/v1
270+
weblogic.resourceVersion: domain-v1
271271
weblogic.domainUID: %DOMAIN_UID%
272272
weblogic.domainName: %DOMAIN_NAME%
273273
app: %DOMAIN_UID%-create-weblogic-domain-job

‎kubernetes/internal/create-weblogic-domain.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ function initAndValidateOutputDir {
111111
# Function to validate the version of the inputs file
112112
#
113113
function validateVersion {
114-
local requiredVersion='create-weblogic-domain-inputs/v1'
114+
local requiredVersion='create-weblogic-domain-inputs-v1'
115115
if [ "${version}" != "${requiredVersion}" ]; then
116116
validationError "Invalid version: \"${version}\". Must be ${requiredVersion}."
117117
fi

‎kubernetes/internal/create-weblogic-operator.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ function validateImagePullPolicy {
209209
# Function to validate the version of the inputs file
210210
#
211211
function validateVersion {
212-
local requiredVersion='create-weblogic-operator-inputs/v1'
212+
local requiredVersion='create-weblogic-operator-inputs-v1'
213213
if [ "${version}" != "${requiredVersion}" ]; then
214214
validationError "Invalid version: \"${version}\". Must be ${requiredVersion}."
215215
fi

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
name: %DOMAIN_UID%
1010
namespace: %NAMESPACE%
1111
labels:
12-
weblogic.resourceVersion: domain/v1
12+
weblogic.resourceVersion: domain-v1
1313
weblogic.domainUID: %DOMAIN_UID%
1414
weblogic.domainName: %DOMAIN_NAME%
1515
spec:

‎kubernetes/internal/generate-security-policy.sh‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ kind: Namespace
6767
metadata:
6868
name: ${NAMESPACE}
6969
labels:
70-
weblogic.resourceVersion: operator/v1
70+
weblogic.resourceVersion: operator-v1
7171
weblogic.operatorName: ${NAMESPACE}
7272
---
7373
#
@@ -79,7 +79,7 @@ metadata:
7979
namespace: ${NAMESPACE}
8080
name: ${ACCOUNT_NAME}
8181
labels:
82-
weblogic.resourceVersion: operator/v1
82+
weblogic.resourceVersion: operator-v1
8383
weblogic.operatorName: ${NAMESPACE}
8484
---
8585
EOF
@@ -93,7 +93,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
9393
metadata:
9494
name: weblogic-operator-cluster-role
9595
labels:
96-
weblogic.resourceVersion: operator/v1
96+
weblogic.resourceVersion: operator-v1
9797
weblogic.operatorName: ${NAMESPACE}
9898
rules:
9999
- apiGroups: [""]
@@ -126,7 +126,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
126126
metadata:
127127
name: weblogic-operator-cluster-role-nonresource
128128
labels:
129-
weblogic.resourceVersion: operator/v1
129+
weblogic.resourceVersion: operator-v1
130130
weblogic.operatorName: ${NAMESPACE}
131131
rules:
132132
- nonResourceURLs: ["/version/*"]
@@ -140,7 +140,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
140140
metadata:
141141
name: ${NAMESPACE}-operator-rolebinding
142142
labels:
143-
weblogic.resourceVersion: operator/v1
143+
weblogic.resourceVersion: operator-v1
144144
weblogic.operatorName: ${NAMESPACE}
145145
subjects:
146146
- kind: ServiceAccount
@@ -157,7 +157,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
157157
metadata:
158158
name: ${NAMESPACE}-operator-rolebinding-nonresource
159159
labels:
160-
weblogic.resourceVersion: operator/v1
160+
weblogic.resourceVersion: operator-v1
161161
weblogic.operatorName: ${NAMESPACE}
162162
subjects:
163163
- kind: ServiceAccount
@@ -174,7 +174,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
174174
metadata:
175175
name: ${NAMESPACE}-operator-rolebinding-discovery
176176
labels:
177-
weblogic.resourceVersion: operator/v1
177+
weblogic.resourceVersion: operator-v1
178178
weblogic.operatorName: ${NAMESPACE}
179179
subjects:
180180
- kind: ServiceAccount
@@ -191,7 +191,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
191191
metadata:
192192
name: ${NAMESPACE}-operator-rolebinding-auth-delegator
193193
labels:
194-
weblogic.resourceVersion: operator/v1
194+
weblogic.resourceVersion: operator-v1
195195
weblogic.operatorName: ${NAMESPACE}
196196
subjects:
197197
- kind: ServiceAccount
@@ -211,7 +211,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
211211
metadata:
212212
name: weblogic-operator-namespace-role
213213
labels:
214-
weblogic.resourceVersion: operator/v1
214+
weblogic.resourceVersion: operator-v1
215215
weblogic.operatorName: ${NAMESPACE}
216216
rules:
217217
- apiGroups: [""]
@@ -254,7 +254,7 @@ metadata:
254254
name: weblogic-operator-rolebinding
255255
namespace: ${i}
256256
labels:
257-
weblogic.resourceVersion: operator/v1
257+
weblogic.resourceVersion: operator-v1
258258
weblogic.operatorName: ${NAMESPACE}
259259
subjects:
260260
- kind: ServiceAccount

‎kubernetes/internal/voyager-ingress-template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: %DOMAIN_UID%-voyager
55
namespace: %NAMESPACE%
66
labels:
7-
weblogic.resourceVersion: voyager-load-balancer/v1
7+
weblogic.resourceVersion: voyager-load-balancer-v1
88
weblogic.domainUID: %DOMAIN_UID%
99
weblogic.domainName: %DOMAIN_NAME%
1010
annotations:
@@ -28,7 +28,7 @@ metadata:
2828
namespace: %NAMESPACE%
2929
labels:
3030
app: %DOMAIN_UID%-voyager-stats
31-
weblogic.resourceVersion: voyager-load-balancer/v1
31+
weblogic.resourceVersion: voyager-load-balancer-v1
3232
weblogic.domainUID: %DOMAIN_UID%
3333
weblogic.domainName: %DOMAIN_NAME%
3434
spec:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +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
7+
weblogic.resourceVersion: apache-load-balancer-v1
88
weblogic.domainUID: %DOMAIN_UID%
99
weblogic.domainName: %DOMAIN_NAME%
1010
rules:
@@ -33,7 +33,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
3333
metadata:
3434
name: %DOMAIN_UID%-apache-webtier
3535
labels:
36-
weblogic.resourceVersion: apache-load-balancer/v1
36+
weblogic.resourceVersion: apache-load-balancer-v1
3737
weblogic.domainUID: %DOMAIN_UID%
3838
weblogic.domainName: %DOMAIN_NAME%
3939
roleRef:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: %DOMAIN_UID%-apache-webtier
66
namespace: %NAMESPACE%
77
labels:
8-
weblogic.resourceVersion: apache-load-balancer/v1
8+
weblogic.resourceVersion: apache-load-balancer-v1
99
weblogic.domainUID: %DOMAIN_UID%
1010
weblogic.domainName: %DOMAIN_NAME%
1111
app: apache-webtier
@@ -16,7 +16,7 @@ metadata:
1616
name: %DOMAIN_UID%-apache-webtier
1717
namespace: %NAMESPACE%
1818
labels:
19-
weblogic.resourceVersion: apache-load-balancer/v1
19+
weblogic.resourceVersion: apache-load-balancer-v1
2020
weblogic.domainUID: %DOMAIN_UID%
2121
weblogic.domainName: %DOMAIN_NAME%
2222
app: apache-webtier
@@ -30,7 +30,7 @@ spec:
3030
template:
3131
metadata:
3232
labels:
33-
weblogic.resourceVersion: apache-load-balancer/v1
33+
weblogic.resourceVersion: apache-load-balancer-v1
3434
weblogic.domainUID: %DOMAIN_UID%
3535
weblogic.domainName: %DOMAIN_NAME%
3636
app: apache-webtier
@@ -81,7 +81,7 @@ metadata:
8181
name: %DOMAIN_UID%-apache-webtier
8282
namespace: %NAMESPACE%
8383
labels:
84-
weblogic.resourceVersion: apache-load-balancer/v1
84+
weblogic.resourceVersion: apache-load-balancer-v1
8585
weblogic.domainUID: %DOMAIN_UID%
8686
weblogic.domainName: %DOMAIN_NAME%
8787
spec:

0 commit comments

Comments
 (0)