Skip to content

Commit 9a496fc

Browse files
rjeberhardrjeberhard
committed
Use Kubernetes Java Client 23.0.0-legacy
1 parent 78f2750 commit 9a496fc

File tree

7 files changed

+217
-110
lines changed

7 files changed

+217
-110
lines changed

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/primitive/Kubernetes.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2024, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 2025, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.weblogic.kubernetes.actions.impl.primitive;
@@ -415,6 +415,7 @@ public static boolean deleteDeployment(String namespace, String name) throws Api
415415
PRETTY, // String | If 'true', then the output is pretty printed.
416416
null, // String | When present, indicates that modifications should not be persisted.
417417
GRACE_PERIOD, // Integer | The duration in seconds before the object should be deleted.
418+
null,
418419
null, // Boolean | Deprecated: use the PropagationPolicy.
419420
FOREGROUND, // String | Whether and how garbage collection will be performed.
420421
null // V1DeleteOptions.
@@ -505,6 +506,7 @@ public static String getPodLog(String name,
505506
PRETTY, // pretty print output
506507
previous, // Boolean, Return previous terminated container logs
507508
sinceSeconds, // relative time (seconds) before the current time from which to show logs
509+
null,
508510
null, // number of lines from the end of the logs to show
509511
null // Boolean, add timestamp at the beginning of every line of log output
510512
);
@@ -2653,6 +2655,7 @@ public static boolean deleteReplicaSet(String namespace, String name) throws Api
26532655
PRETTY, // String | pretty print output.
26542656
null, // String | When present, indicates that modifications should not be persisted.
26552657
GRACE_PERIOD, // Integer | The duration in seconds before the object should be deleted.
2658+
null,
26562659
null, // Boolean | Deprecated: use the PropagationPolicy.
26572660
FOREGROUND, // String | Whether and how garbage collection will be performed.
26582661
null // V1DeleteOptions.
@@ -2899,6 +2902,7 @@ public static boolean deleteNamespacedRoleBinding(String namespace, String name)
28992902
PRETTY, // String | pretty print output.
29002903
null, // String | When present, indicates that modifications should not be persisted.
29012904
GRACE_PERIOD, // Integer | The duration in seconds before the object should be deleted.
2905+
null,
29022906
null, // Boolean | Deprecated: use the PropagationPolicy.
29032907
FOREGROUND, // String | Whether and how garbage collection will be performed.
29042908
null // V1DeleteOptions.
@@ -2988,6 +2992,7 @@ public static boolean deleteClusterRole(String name) throws ApiException {
29882992
PRETTY, // String | pretty print output.
29892993
null, // String | When present, indicates that modifications should not be persisted.
29902994
GRACE_PERIOD, // Integer | The duration in seconds before the object should be deleted.
2995+
null,
29912996
null, // Boolean | Deprecated: use the PropagationPolicy.
29922997
FOREGROUND, // String | Whether and how garbage collection will be performed.
29932998
null // V1DeleteOptions.
@@ -3046,6 +3051,7 @@ public static boolean deleteNamespacedRole(String namespace, String name) throws
30463051
PRETTY, // String | pretty print output.
30473052
null, // String | When present, indicates that modifications should not be persisted.
30483053
GRACE_PERIOD, // Integer | The duration in seconds before the object should be deleted.
3054+
null,
30493055
null, // Boolean | Deprecated: use the PropagationPolicy.
30503056
FOREGROUND, // String | Whether and how garbage collection will be performed.
30513057
null // V1DeleteOptions.
@@ -3204,6 +3210,7 @@ public static boolean deleteIngress(String name, String namespace) throws ApiExc
32043210
PRETTY, // String | If 'true', then the output is pretty printed.
32053211
null, // String | dry run or permanent change
32063212
GRACE_PERIOD, // Integer | The duration in seconds before the object should be deleted.
3213+
null,
32073214
null, // Boolean | Deprecated: use the PropagationPolicy.
32083215
BACKGROUND, // String | Whether and how garbage collection will be performed.
32093216
null // V1DeleteOptions.

‎kubernetes/crd/cluster-crd.yaml

Lines changed: 40 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
66
metadata:
77
annotations:
8-
weblogic.sha256: 51834749ee33a25fe0e79d977ca46d1779eb7b129e7a2c9d1bae7fbc399c9da6
8+
weblogic.sha256: 3655b015d8b8433e99f974fe3c1a0f58a6522f9ce96297ad99846b92e5bbdb3d
99
name: clusters.weblogic.oracle
1010
spec:
1111
group: weblogic.oracle
@@ -120,8 +120,6 @@ spec:
120120
field, the operator will use default content for the pod-level
121121
`securityContext`. More info: https://oracle.github.io/weblogic-kubernetes-operator/security/domain-security/pod-and-container/.'
122122
properties:
123-
runAsUser:
124-
type: integer
125123
seLinuxOptions:
126124
properties:
127125
role:
@@ -144,6 +142,28 @@ spec:
144142
type: object
145143
fsGroup:
146144
type: integer
145+
fsGroupChangePolicy:
146+
type: string
147+
seLinuxChangePolicy:
148+
type: string
149+
runAsGroup:
150+
type: integer
151+
runAsNonRoot:
152+
type: boolean
153+
sysctls:
154+
items:
155+
type: object
156+
properties:
157+
name:
158+
type: string
159+
value:
160+
type: string
161+
required:
162+
- name
163+
- value
164+
type: array
165+
runAsUser:
166+
type: integer
147167
seccompProfile:
148168
properties:
149169
localhostProfile:
@@ -164,28 +184,12 @@ spec:
164184
gmsaCredentialSpecName:
165185
type: string
166186
type: object
167-
fsGroupChangePolicy:
168-
type: string
169187
supplementalGroups:
170188
items:
171189
type: integer
172190
type: array
173-
runAsGroup:
174-
type: integer
175-
runAsNonRoot:
176-
type: boolean
177-
sysctls:
178-
items:
179-
type: object
180-
properties:
181-
name:
182-
type: string
183-
value:
184-
type: string
185-
required:
186-
- name
187-
- value
188-
type: array
191+
supplementalGroupsPolicy:
192+
type: string
189193
type: object
190194
priorityClassName:
191195
description: If specified, indicates the Pod's priority. "system-node-critical"
@@ -214,6 +218,8 @@ spec:
214218
type: array
215219
items:
216220
type: string
221+
required:
222+
- ip
217223
type: array
218224
startupProbe:
219225
description: Settings for the startup probe associated with a
@@ -1106,6 +1112,13 @@ spec:
11061112
type: string
11071113
required:
11081114
- pdName
1115+
image:
1116+
type: object
1117+
properties:
1118+
reference:
1119+
type: string
1120+
pullPolicy:
1121+
type: string
11091122
photonPersistentDisk:
11101123
type: object
11111124
properties:
@@ -1420,6 +1433,8 @@ spec:
14201433
items:
14211434
type: object
14221435
properties:
1436+
request:
1437+
type: string
14231438
name:
14241439
type: string
14251440
required:
@@ -1613,6 +1628,8 @@ spec:
16131628
items:
16141629
type: object
16151630
properties:
1631+
request:
1632+
type: string
16161633
name:
16171634
type: string
16181635
required:
@@ -2178,6 +2195,8 @@ spec:
21782195
items:
21792196
type: object
21802197
properties:
2198+
request:
2199+
type: string
21812200
name:
21822201
type: string
21832202
required:

0 commit comments

Comments
 (0)