Skip to content

Commit

Permalink
Bump Kubernetes dependencies to v0.31.x (kubernetes-sigs#2402)
Browse files Browse the repository at this point in the history 
* Bump kubernetes dependencies to v0.31.x.

* Use Kubernetes v1.31.0 on tests.

* Bump kubernetes dependencies to v0.31.1.
  • Loading branch information
@mbobrovskyi
mbobrovskyi authored Sep 12, 2024
1 parent e27bd2d commit c03277c
Show file tree
Hide file tree
Showing 2,653 changed files with 137,476 additions and 72,653 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ update-helm: manifests yq
.PHONY: generate
generate: gomod-download controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations and client-go libraries.
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./apis/..."
./hack/update-codegen.sh $(GO_CMD)
TOOLS_DIR=${TOOLS_DIR} ./hack/update-codegen.sh $(GO_CMD)

.PHONY: fmt
fmt: ## Run go fmt against code.
Expand Down
6 changes: 3 additions & 3 deletions Makefile-test.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ LD_FLAGS += -X '$(version_pkg).GitVersion=$(GIT_TAG)'
LD_FLAGS += -X '$(version_pkg).GitCommit=$(shell git rev-parse HEAD)'

# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION ?= 1.30
ENVTEST_K8S_VERSION ?= 1.31

# Number of processes to use during integration tests to run specs within a
# suite in parallel. Suites still run sequentially. User may set this value to 1
Expand All @@ -41,9 +41,9 @@ INTEGRATION_API_LOG_LEVEL ?= 0

# Folder where the e2e tests are located.
E2E_TARGET ?= ./test/e2e/...
E2E_KIND_VERSION ?= kindest/node:v1.30.0
E2E_KIND_VERSION ?= kindest/node:v1.31.0
# E2E_K8S_VERSIONS sets the list of k8s versions included in test-e2e-all
E2E_K8S_VERSIONS ?= 1.28.9 1.29.4 1.30.0
E2E_K8S_VERSIONS ?= 1.28.13 1.29.8 1.30.4 1.31.0

# For local testing, we should allow user to use different kind cluster name
# Default will delete default kind cluster
Expand Down
53 changes: 51 additions & 2 deletions apis/visibility/v1alpha1/openapi/zz_generated.openapi.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 4 additions & 17 deletions charts/kueue/templates/crd/kueue.x-k8s.io_admissionchecks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
{{- if .Values.enableCertManager }}
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "kueue.fullname" . }}-serving-cert
{{- end }}
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.16.1
name: admissionchecks.kueue.x-k8s.io
spec:
conversion:
Expand Down Expand Up @@ -107,16 +107,8 @@ spec:
conditions hold the latest available observations of the AdmissionCheck
current state.
items:
description: "Condition contains details for one aspect of the current
state of this API Resource.\n---\nThis struct is intended for
direct use as an array at the field path .status.conditions. For
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
observations of a foo's current state.\n\t // Known .status.conditions.type
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
\ // other fields\n\t}"
description: Condition contains details for one aspect of the current
state of this API Resource.
properties:
lastTransitionTime:
description: |-
Expand Down Expand Up @@ -157,12 +149,7 @@ spec:
- Unknown
type: string
type:
description: |-
type of condition in CamelCase or in foo.example.com/CamelCase.
---
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
useful (see .node.status.conditions), the ability to deconflict is important.
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
description: type of condition in CamelCase or in foo.example.com/CamelCase.
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
Expand Down
35 changes: 4 additions & 31 deletions charts/kueue/templates/crd/kueue.x-k8s.io_clusterqueues.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
{{- if .Values.enableCertManager }}
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "kueue.fullname" . }}-serving-cert
{{- end }}
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.16.1
name: clusterqueues.kueue.x-k8s.io
spec:
conversion:
Expand Down Expand Up @@ -117,19 +117,16 @@ spec:
cohort that this ClusterQueue belongs to. CQs that belong to the
same cohort can borrow unused resources from each other.
A CQ can be a member of a single borrowing cohort. A workload submitted
to a queue referencing this CQ can borrow quota from any CQ in the cohort.
Only quota for the [resource, flavor] pairs listed in the CQ can be
borrowed.
If empty, this ClusterQueue cannot borrow from any other ClusterQueue and
vice versa.
A cohort is a name that links CQs together, but it doesn't reference any
object.
Validation of a cohort name is equivalent to that of object names:
subdomain in DNS (RFC 1123).
maxLength: 253
Expand Down Expand Up @@ -169,7 +166,6 @@ spec:
whenCanBorrow determines whether a workload should try the next flavor
before borrowing in current flavor. The possible values are:
- `Borrow` (default): allocate in current flavor if borrowing
is possible.
- `TryNextFlavor`: try next flavor even if the current
Expand All @@ -184,7 +180,6 @@ spec:
whenCanPreempt determines whether a workload should try the next flavor
before borrowing in current flavor. The possible values are:
- `Preempt`: allocate in current flavor if it's possible to preempt some workloads.
- `TryNextFlavor` (default): try next flavor even if there are enough
candidates for preemption in the current flavor.
Expand Down Expand Up @@ -250,18 +245,15 @@ spec:
preemption describes policies to preempt Workloads from this ClusterQueue
or the ClusterQueue's cohort.
Preemption can happen in two scenarios:
- When a Workload fits within the nominal quota of the ClusterQueue, but
the quota is currently borrowed by other ClusterQueues in the cohort.
Preempting Workloads in other ClusterQueues allows this ClusterQueue to
reclaim its nominal quota.
- When a Workload doesn't fit within the nominal quota of the ClusterQueue
and there are admitted Workloads in the ClusterQueue with lower priority.
The preemption algorithm tries to find a minimal set of Workloads to
preempt to accomomdate the pending Workload, preempting Workloads with
lower priority first.
Expand Down Expand Up @@ -303,7 +295,6 @@ spec:
Workloads from other ClusterQueues in the cohort that are using more than
their nominal quota. The possible values are:
- `Never` (default): do not preempt Workloads in the cohort.
- `LowerPriority`: if the pending Workload fits within the nominal
quota of its ClusterQueue, only preempt Workloads in the cohort that have
Expand All @@ -323,7 +314,6 @@ spec:
within the nominal quota for its ClusterQueue, can preempt active Workloads in
the ClusterQueue. The possible values are:
- `Never` (default): do not preempt Workloads in the ClusterQueue.
- `LowerPriority`: only preempt Workloads in the ClusterQueue that have
lower priority than the pending Workload.
Expand All @@ -347,7 +337,6 @@ spec:
across the queues in this ClusterQueue.
Current Supported Strategies:
- StrictFIFO: workloads are ordered strictly by creation time.
Older workloads that can't be admitted will block admitting newer
workloads even if they fit available quota.
Expand Down Expand Up @@ -454,7 +443,6 @@ spec:
should account for resources that can be provided by a component such as
Kubernetes cluster-autoscaler.
If the ClusterQueue belongs to a cohort, the sum of the quotas for each
(flavor, resource) combination defines the maximum quantity that can be
allocated by a ClusterQueue in the cohort.
Expand Down Expand Up @@ -497,10 +485,8 @@ spec:
stopPolicy - if set to a value different from None, the ClusterQueue is considered Inactive, no new reservation being
made.
Depending on its value, its associated workloads will:
- None - Workloads are admitted
- HoldAndDrain - Admitted workloads are evicted and Reserving workloads will cancel the reservation.
- Hold - Admitted workloads will run to completion and Reserving workloads will cancel the reservation.
Expand Down Expand Up @@ -528,16 +514,8 @@ spec:
conditions hold the latest available observations of the ClusterQueue
current state.
items:
description: "Condition contains details for one aspect of the current
state of this API Resource.\n---\nThis struct is intended for
direct use as an array at the field path .status.conditions. For
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
observations of a foo's current state.\n\t // Known .status.conditions.type
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
\ // other fields\n\t}"
description: Condition contains details for one aspect of the current
state of this API Resource.
properties:
lastTransitionTime:
description: |-
Expand Down Expand Up @@ -578,12 +556,7 @@ spec:
- Unknown
type: string
type:
description: |-
type of condition in CamelCase or in foo.example.com/CamelCase.
---
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
useful (see .node.status.conditions), the ability to deconflict is important.
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
description: type of condition in CamelCase or in foo.example.com/CamelCase.
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
Expand Down
26 changes: 4 additions & 22 deletions charts/kueue/templates/crd/kueue.x-k8s.io_cohorts.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
{{- if .Values.enableCertManager }}
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "kueue.fullname" . }}-serving-cert
{{- end }}
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.16.1
name: cohorts.kueue.x-k8s.io
spec:
conversion:
Expand Down Expand Up @@ -62,7 +62,6 @@ spec:
2) References a non-existent Cohort. We use default Cohort (no borrowing/lending limits).
3) References an existent Cohort.
If a cycle is created, we disable all members of the
Cohort, including ClusterQueues, until the cycle is
removed. We prevent further admission while the cycle
Expand All @@ -79,15 +78,12 @@ spec:
of one ResourceGroup. There may be up to 16 ResourceGroups
within a Cohort.
BorrowingLimit limits how much members of this Cohort
subtree can borrow from the parent subtree.
LendingLimit limits how much members of this Cohort subtree
can lend to the parent subtree.
Borrowing and Lending limits must only be set when the
Cohort has a parent. Otherwise, the Cohort create/update
will be rejected by the webhook.
Expand Down Expand Up @@ -180,7 +176,6 @@ spec:
should account for resources that can be provided by a component such as
Kubernetes cluster-autoscaler.
If the ClusterQueue belongs to a cohort, the sum of the quotas for each
(flavor, resource) combination defines the maximum quantity that can be
allocated by a ClusterQueue in the cohort.
Expand Down Expand Up @@ -223,16 +218,8 @@ spec:
properties:
conditions:
items:
description: "Condition contains details for one aspect of the current
state of this API Resource.\n---\nThis struct is intended for
direct use as an array at the field path .status.conditions. For
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
observations of a foo's current state.\n\t // Known .status.conditions.type
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
\ // other fields\n\t}"
description: Condition contains details for one aspect of the current
state of this API Resource.
properties:
lastTransitionTime:
description: |-
Expand Down Expand Up @@ -273,12 +260,7 @@ spec:
- Unknown
type: string
type:
description: |-
type of condition in CamelCase or in foo.example.com/CamelCase.
---
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
useful (see .node.status.conditions), the ability to deconflict is important.
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
description: type of condition in CamelCase or in foo.example.com/CamelCase.
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
Expand Down
Loading

0 comments on commit c03277c

Please sign in to comment.