Skip to content

Commit e0af0f3

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1431 from damdo/bump-k8s-1.34
OCPCLOUD-3080: Bump k8s dependencies to 1.34
2 parents 7410733 + 9aed01f commit e0af0f3

File tree

2,831 files changed

+199167
-160742
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,831 files changed

+199167
-160742
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ MUTABLE_TAG ?= latest
55
IMAGE = $(REGISTRY)machine-api-operator
66
BUILD_IMAGE ?= registry.ci.openshift.org/openshift/release:golang-1.24
77
GOLANGCI_LINT = go run ./vendor/github.com/golangci/golangci-lint/cmd/golangci-lint
8-
ENVTEST_K8S_VERSION = 1.33.2
8+
ENVTEST_K8S_VERSION = 1.34.1
99

1010
# Enable go modules and vendoring
1111
# https://github.com/golang/go/wiki/Modules#how-to-install-and-activate-module-support

‎go.mod‎

Lines changed: 98 additions & 100 deletions
Large diffs are not rendered by default.

‎go.sum‎

Lines changed: 209 additions & 217 deletions
Large diffs are not rendered by default.

‎install/0000_30_machine-api-operator_02_machine.CustomNoUpgrade.crd.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,9 +341,8 @@ spec:
341341
description: Required. The taint key to be applied to a node.
342342
type: string
343343
timeAdded:
344-
description: |-
345-
TimeAdded represents the time at which the taint was added.
346-
It is only written for NoExecute taints.
344+
description: TimeAdded represents the time at which the taint
345+
was added.
347346
format: date-time
348347
type: string
349348
value:

‎install/0000_30_machine-api-operator_02_machine.Default.crd.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,8 @@ spec:
327327
description: Required. The taint key to be applied to a node.
328328
type: string
329329
timeAdded:
330-
description: |-
331-
TimeAdded represents the time at which the taint was added.
332-
It is only written for NoExecute taints.
330+
description: TimeAdded represents the time at which the taint
331+
was added.
333332
format: date-time
334333
type: string
335334
value:

‎install/0000_30_machine-api-operator_02_machine.DevPreviewNoUpgrade.crd.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,9 +341,8 @@ spec:
341341
description: Required. The taint key to be applied to a node.
342342
type: string
343343
timeAdded:
344-
description: |-
345-
TimeAdded represents the time at which the taint was added.
346-
It is only written for NoExecute taints.
344+
description: TimeAdded represents the time at which the taint
345+
was added.
347346
format: date-time
348347
type: string
349348
value:

‎install/0000_30_machine-api-operator_02_machine.TechPreviewNoUpgrade.crd.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,9 +341,8 @@ spec:
341341
description: Required. The taint key to be applied to a node.
342342
type: string
343343
timeAdded:
344-
description: |-
345-
TimeAdded represents the time at which the taint was added.
346-
It is only written for NoExecute taints.
344+
description: TimeAdded represents the time at which the taint
345+
was added.
347346
format: date-time
348347
type: string
349348
value:

‎install/0000_30_machine-api-operator_03_machineset.CustomNoUpgrade.crd.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,8 @@ spec:
542542
a node.
543543
type: string
544544
timeAdded:
545-
description: |-
546-
TimeAdded represents the time at which the taint was added.
547-
It is only written for NoExecute taints.
545+
description: TimeAdded represents the time at which
546+
the taint was added.
548547
format: date-time
549548
type: string
550549
value:

‎install/0000_30_machine-api-operator_03_machineset.Default.crd.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -514,9 +514,8 @@ spec:
514514
a node.
515515
type: string
516516
timeAdded:
517-
description: |-
518-
TimeAdded represents the time at which the taint was added.
519-
It is only written for NoExecute taints.
517+
description: TimeAdded represents the time at which
518+
the taint was added.
520519
format: date-time
521520
type: string
522521
value:

‎install/0000_30_machine-api-operator_03_machineset.DevPreviewNoUpgrade.crd.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,8 @@ spec:
542542
a node.
543543
type: string
544544
timeAdded:
545-
description: |-
546-
TimeAdded represents the time at which the taint was added.
547-
It is only written for NoExecute taints.
545+
description: TimeAdded represents the time at which
546+
the taint was added.
548547
format: date-time
549548
type: string
550549
value:

0 commit comments

Comments
 (0)