Skip to content

Commit 8893d3c

Browse files
tenzen-ytenzen-y
committed
Use Kubernetes v1.33
Signed-off-by: Yuki Iwai <[email protected]>
1 parent c637101 commit 8893d3c

File tree

18 files changed

+415
-227
lines changed

18 files changed

+415
-227
lines changed

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
strategy:
4040
fail-fast: false
4141
matrix:
42-
kubernetes-version: ["v1.30.4", "v1.31.1", "v1.32.5"]
42+
kubernetes-version: ["v1.31.1", "v1.32.5", "v1.33.4"]
4343
steps:
4444
- name: Clone the code
4545
uses: actions/checkout@v3

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ IMAGE_NAME?=${REGISTRY}/mpi-operator
3232
KUBEBUILDER_ASSETS_PATH := $(dir $(abspath $(firstword $(MAKEFILE_LIST))))bin/kubebuilder/bin
3333
HELM_VERSION=v3.11.2
3434
# This kubectl version supports -k for kustomization.
35-
KUBECTL_VERSION=v1.32.0
36-
ENVTEST_K8S_VERSION=1.32.0
35+
KUBECTL_VERSION=v1.33.0
36+
ENVTEST_K8S_VERSION=1.33.0
3737
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
3838
GOARCH=$(shell go env GOARCH)
3939
GOOS=$(shell go env GOOS)
@@ -179,7 +179,7 @@ goimports:
179179
CONTROLLER_GEN = $(PROJECT_DIR)/bin/controller-gen
180180
.PHONY: controller-gen
181181
controller-gen: bin
182-
@GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.3
182+
@GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.18.0
183183

184184
KUSTOMIZE = $(PROJECT_DIR)/bin/kustomize
185185
.PHONY: kustomize

‎cmd/mpi-operator/app/server.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ func Run(opt *options.ServerOption) error {
142142
kubeflowInformerFactory := informers.NewSharedInformerFactoryWithOptions(mpiJobClientSet, 0, kubeflowInformerFactoryOpts...)
143143

144144
controller, err := controllersv1.NewMPIJobController(
145+
ctx,
145146
kubeClient,
146147
mpiJobClientSet,
147148
volcanoClientSet,

‎deploy/v2beta1/mpi-operator.yaml‎

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ apiVersion: apiextensions.k8s.io/v1
2121
kind: CustomResourceDefinition
2222
metadata:
2323
annotations:
24-
controller-gen.kubebuilder.io/version: v0.17.3
24+
controller-gen.kubebuilder.io/version: v0.18.0
2525
labels:
2626
app: mpi-operator
2727
app.kubernetes.io/component: mpijob
@@ -422,7 +422,6 @@ spec:
422422
pod labels will be ignored. The default value is empty.
423423
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
424424
Also, matchLabelKeys cannot be set when labelSelector isn't set.
425-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
426425
items:
427426
type: string
428427
type: array
@@ -437,7 +436,6 @@ spec:
437436
pod labels will be ignored. The default value is empty.
438437
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
439438
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
440-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
441439
items:
442440
type: string
443441
type: array
@@ -607,7 +605,6 @@ spec:
607605
pod labels will be ignored. The default value is empty.
608606
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
609607
Also, matchLabelKeys cannot be set when labelSelector isn't set.
610-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
611608
items:
612609
type: string
613610
type: array
@@ -622,7 +619,6 @@ spec:
622619
pod labels will be ignored. The default value is empty.
623620
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
624621
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
625-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
626622
items:
627623
type: string
628624
type: array
@@ -791,7 +787,6 @@ spec:
791787
pod labels will be ignored. The default value is empty.
792788
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
793789
Also, matchLabelKeys cannot be set when labelSelector isn't set.
794-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
795790
items:
796791
type: string
797792
type: array
@@ -806,7 +801,6 @@ spec:
806801
pod labels will be ignored. The default value is empty.
807802
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
808803
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
809-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
810804
items:
811805
type: string
812806
type: array
@@ -976,7 +970,6 @@ spec:
976970
pod labels will be ignored. The default value is empty.
977971
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
978972
Also, matchLabelKeys cannot be set when labelSelector isn't set.
979-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
980973
items:
981974
type: string
982975
type: array
@@ -991,7 +984,6 @@ spec:
991984
pod labels will be ignored. The default value is empty.
992985
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
993986
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
994-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
995987
items:
996988
type: string
997989
type: array
@@ -1258,7 +1250,7 @@ spec:
12581250
Cannot be updated.
12591251
items:
12601252
description: EnvFromSource represents the source
1261-
of a set of ConfigMaps
1253+
of a set of ConfigMaps or Secrets
12621254
properties:
12631255
configMapRef:
12641256
description: The ConfigMap to select from
@@ -1279,9 +1271,9 @@ spec:
12791271
type: object
12801272
x-kubernetes-map-type: atomic
12811273
prefix:
1282-
description: An optional identifier to prepend
1283-
to each key in the ConfigMap. Must be
1284-
a C_IDENTIFIER.
1274+
description: Optional text to prepend to
1275+
the name of each environment variable.
1276+
Must be a C_IDENTIFIER.
12851277
type: string
12861278
secretRef:
12871279
description: The Secret to select from
@@ -1555,6 +1547,12 @@ spec:
15551547
- port
15561548
type: object
15571549
type: object
1550+
stopSignal:
1551+
description: |-
1552+
StopSignal defines which signal will be sent to a container when it is being stopped.
1553+
If not specified, the default is defined by the container runtime in use.
1554+
StopSignal can only be set for Pods with a non-empty .spec.os.name
1555+
type: string
15581556
type: object
15591557
livenessProbe:
15601558
description: |-
@@ -2789,7 +2787,7 @@ spec:
27892787
Cannot be updated.
27902788
items:
27912789
description: EnvFromSource represents the source
2792-
of a set of ConfigMaps
2790+
of a set of ConfigMaps or Secrets
27932791
properties:
27942792
configMapRef:
27952793
description: The ConfigMap to select from
@@ -2810,9 +2808,9 @@ spec:
28102808
type: object
28112809
x-kubernetes-map-type: atomic
28122810
prefix:
2813-
description: An optional identifier to prepend
2814-
to each key in the ConfigMap. Must be
2815-
a C_IDENTIFIER.
2811+
description: Optional text to prepend to
2812+
the name of each environment variable.
2813+
Must be a C_IDENTIFIER.
28162814
type: string
28172815
secretRef:
28182816
description: The Secret to select from
@@ -3083,6 +3081,12 @@ spec:
30833081
- port
30843082
type: object
30853083
type: object
3084+
stopSignal:
3085+
description: |-
3086+
StopSignal defines which signal will be sent to a container when it is being stopped.
3087+
If not specified, the default is defined by the container runtime in use.
3088+
StopSignal can only be set for Pods with a non-empty .spec.os.name
3089+
type: string
30863090
type: object
30873091
livenessProbe:
30883092
description: Probes are not allowed for ephemeral
@@ -4139,7 +4143,7 @@ spec:
41394143
Init containers may not have Lifecycle actions, Readiness probes, Liveness probes, or Startup probes.
41404144
The resourceRequirements of an init container are taken into account during scheduling
41414145
by finding the highest request/limit for each resource type, and then using the max of
4142-
of that value or the sum of the normal containers. Limits are applied to init containers
4146+
that value or the sum of the normal containers. Limits are applied to init containers
41434147
in a similar fashion.
41444148
Init containers cannot currently be added or removed.
41454149
Cannot be updated.
@@ -4317,7 +4321,7 @@ spec:
43174321
Cannot be updated.
43184322
items:
43194323
description: EnvFromSource represents the source
4320-
of a set of ConfigMaps
4324+
of a set of ConfigMaps or Secrets
43214325
properties:
43224326
configMapRef:
43234327
description: The ConfigMap to select from
@@ -4338,9 +4342,9 @@ spec:
43384342
type: object
43394343
x-kubernetes-map-type: atomic
43404344
prefix:
4341-
description: An optional identifier to prepend
4342-
to each key in the ConfigMap. Must be
4343-
a C_IDENTIFIER.
4345+
description: Optional text to prepend to
4346+
the name of each environment variable.
4347+
Must be a C_IDENTIFIER.
43444348
type: string
43454349
secretRef:
43464350
description: The Secret to select from
@@ -4614,6 +4618,12 @@ spec:
46144618
- port
46154619
type: object
46164620
type: object
4621+
stopSignal:
4622+
description: |-
4623+
StopSignal defines which signal will be sent to a container when it is being stopped.
4624+
If not specified, the default is defined by the container runtime in use.
4625+
StopSignal can only be set for Pods with a non-empty .spec.os.name
4626+
type: string
46174627
type: object
46184628
livenessProbe:
46194629
description: |-
@@ -6335,7 +6345,6 @@ spec:
63356345
- Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
63366346

63376347
If this value is nil, the behavior is equivalent to the Honor policy.
6338-
This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag.
63396348
type: string
63406349
nodeTaintsPolicy:
63416350
description: |-
@@ -6346,7 +6355,6 @@ spec:
63466355
- Ignore: node taints are ignored. All nodes are included.
63476356

63486357
If this value is nil, the behavior is equivalent to the Ignore policy.
6349-
This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag.
63506358
type: string
63516359
topologyKey:
63526360
description: |-
@@ -7352,7 +7360,7 @@ spec:
73527360
The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
73537361
The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
73547362
The volume will be mounted read-only (ro) and non-executable files (noexec).
7355-
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
7363+
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
73567364
The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
73577365
properties:
73587366
pullPolicy:

0 commit comments

Comments
 (0)