Skip to content

Commit d4a21e6

Browse files
hessjcghessjcg
authored
chore(deps): Upgrade k8s libraries to 1.27.2, controller-runtime to 0.15.0 (#380)
Update kubernetes libraries to 1.27.2, and controller-runtime to 0.15.0. These upgrades need to be made together. And, since controller-runtime introduced a few breaking changes, this includes updates to the operator code to bring it up to date.
1 parent e307ce4 commit d4a21e6

14 files changed

+199
-512
lines changed

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ SHELL = /usr/bin/env bash -o pipefail
5454
.SHELLFLAGS = -ec
5555

5656
## The version to use for the cert-manager operator
57-
CERT_MANAGER_VERSION=v1.11.1# renovate datasource=github-tags depName=cert-manager/cert-manager
57+
CERT_MANAGER_VERSION=v1.12.1# renovate datasource=github-tags depName=cert-manager/cert-manager
5858

5959
##@ General
6060

@@ -436,10 +436,10 @@ CRD_REF_DOCS ?= $(LOCALBIN)/crd-ref-docs
436436
# Important note: avoid adding spaces in the macro declarations as any
437437
# additional whitespace will break the renovate regex rules.
438438

439-
KUBECTL_VERSION=v1.27.1# renovate datasource=github-tags depName=kubernetes/kubernetes
439+
KUBECTL_VERSION=v1.27.2# renovate datasource=github-tags depName=kubernetes/kubernetes
440440
TERRAFORM_VERSION=v1.4.6# renovate datasource=github-tags depName=hashicorp/terraform
441441

442-
CONTROLLER_TOOLS_VERSION=v0.11.3# renovate datasource=go depName=sigs.k8s.io/controller-tools
442+
CONTROLLER_TOOLS_VERSION=v0.12.0# renovate datasource=go depName=sigs.k8s.io/controller-tools
443443
CRD_REF_DOCS_VERSION=v0.0.9# renovate datasource=go depName=github.com/elastic/crd-ref-docs
444444
ENVTEST_VERSION=v0.0.0-20230301194117-e2d8821b277f# renovate datasource=go depName=sigs.k8s.io/controller-runtime/tools/setup-envtest
445445
GOLANGCI_LINT_VERSION=v1.51.2# renovate datasource=go depName=github.com/golangci/golangci-lint/cmd/golangci-lint

‎config/crd/bases/cloudsql.cloud.google.com_authproxyworkloads.yaml

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ apiVersion: apiextensions.k8s.io/v1
1515
kind: CustomResourceDefinition
1616
metadata:
1717
annotations:
18-
controller-gen.kubebuilder.io/version: v0.11.3
19-
creationTimestamp: null
18+
controller-gen.kubebuilder.io/version: v0.12.0
2019
name: authproxyworkloads.cloudsql.cloud.google.com
2120
spec:
2221
group: cloudsql.cloud.google.com
@@ -223,7 +222,7 @@ spec:
223222
description: HTTPHeader describes a custom header to be used in HTTP probes
224223
properties:
225224
name:
226-
description: The header field name
225+
description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
227226
type: string
228227
value:
229228
description: The header field value
@@ -288,7 +287,7 @@ spec:
288287
description: HTTPHeader describes a custom header to be used in HTTP probes
289288
properties:
290289
name:
291-
description: The header field name
290+
description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
292291
type: string
293292
value:
294293
description: The header field value
@@ -347,7 +346,7 @@ spec:
347346
format: int32
348347
type: integer
349348
grpc:
350-
description: GRPC specifies an action involving a GRPC port. This is a beta field and requires enabling GRPCContainerProbe feature gate.
349+
description: GRPC specifies an action involving a GRPC port.
351350
properties:
352351
port:
353352
description: Port number of the gRPC service. Number must be in the range 1 to 65535.
@@ -371,7 +370,7 @@ spec:
371370
description: HTTPHeader describes a custom header to be used in HTTP probes
372371
properties:
373372
name:
374-
description: The header field name
373+
description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
375374
type: string
376375
value:
377376
description: The header field value
@@ -483,7 +482,7 @@ spec:
483482
format: int32
484483
type: integer
485484
grpc:
486-
description: GRPC specifies an action involving a GRPC port. This is a beta field and requires enabling GRPCContainerProbe feature gate.
485+
description: GRPC specifies an action involving a GRPC port.
487486
properties:
488487
port:
489488
description: Port number of the gRPC service. Number must be in the range 1 to 65535.
@@ -507,7 +506,7 @@ spec:
507506
description: HTTPHeader describes a custom header to be used in HTTP probes
508507
properties:
509508
name:
510-
description: The header field name
509+
description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
511510
type: string
512511
value:
513512
description: The header field value
@@ -568,6 +567,23 @@ spec:
568567
format: int32
569568
type: integer
570569
type: object
570+
resizePolicy:
571+
description: Resources resize policy for the container.
572+
items:
573+
description: ContainerResizePolicy represents resource resize policy for the container.
574+
properties:
575+
resourceName:
576+
description: 'Name of the resource to which this resource resize policy applies. Supported values: cpu, memory.'
577+
type: string
578+
restartPolicy:
579+
description: Restart policy to apply when specified resource is resized. If not specified, it defaults to NotRequired.
580+
type: string
581+
required:
582+
- resourceName
583+
- restartPolicy
584+
type: object
585+
type: array
586+
x-kubernetes-list-type: atomic
571587
resources:
572588
description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
573589
properties:
@@ -602,7 +618,7 @@ spec:
602618
- type: string
603619
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
604620
x-kubernetes-int-or-string: true
605-
description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
621+
description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
606622
type: object
607623
type: object
608624
securityContext:
@@ -709,7 +725,7 @@ spec:
709725
format: int32
710726
type: integer
711727
grpc:
712-
description: GRPC specifies an action involving a GRPC port. This is a beta field and requires enabling GRPCContainerProbe feature gate.
728+
description: GRPC specifies an action involving a GRPC port.
713729
properties:
714730
port:
715731
description: Port number of the gRPC service. Number must be in the range 1 to 65535.
@@ -733,7 +749,7 @@ spec:
733749
description: HTTPHeader describes a custom header to be used in HTTP probes
734750
properties:
735751
name:
736-
description: The header field name
752+
description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header.
737753
type: string
738754
value:
739755
description: The header field value
@@ -906,7 +922,7 @@ spec:
906922
- type: string
907923
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
908924
x-kubernetes-int-or-string: true
909-
description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
925+
description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
910926
type: object
911927
type: object
912928
rolloutStrategy:

‎config/rbac/role.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
apiVersion: rbac.authorization.k8s.io/v1
1515
kind: ClusterRole
1616
metadata:
17-
creationTimestamp: null
1817
name: manager-role
1918
rules:
2019
- apiGroups:

‎go.mod

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,65 +5,65 @@ go 1.20
55
require (
66
github.com/go-logr/logr v1.2.4
77
go.uber.org/zap v1.24.0
8-
k8s.io/api v0.26.3
9-
k8s.io/apimachinery v0.26.3
10-
k8s.io/client-go v0.26.3
11-
sigs.k8s.io/controller-runtime v0.14.6
8+
k8s.io/api v0.27.2
9+
k8s.io/apimachinery v0.27.2
10+
k8s.io/client-go v0.27.2
11+
sigs.k8s.io/controller-runtime v0.15.0
1212
sigs.k8s.io/yaml v1.3.0
1313
)
1414

1515
require (
1616
github.com/beorn7/perks v1.0.1 // indirect
17-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
17+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
1818
github.com/davecgh/go-spew v1.1.1 // indirect
1919
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
2020
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
2121
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
2222
github.com/fsnotify/fsnotify v1.6.0 // indirect
23-
github.com/go-logr/zapr v1.2.3 // indirect
24-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
25-
github.com/go-openapi/jsonreference v0.20.0 // indirect
26-
github.com/go-openapi/swag v0.19.14 // indirect
23+
github.com/go-logr/zapr v1.2.4 // indirect
24+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
25+
github.com/go-openapi/jsonreference v0.20.1 // indirect
26+
github.com/go-openapi/swag v0.22.3 // indirect
2727
github.com/gogo/protobuf v1.3.2 // indirect
2828
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
29-
github.com/golang/protobuf v1.5.2 // indirect
29+
github.com/golang/protobuf v1.5.3 // indirect
3030
github.com/google/gnostic v0.5.7-v3refs // indirect
3131
github.com/google/go-cmp v0.5.9 // indirect
3232
github.com/google/gofuzz v1.1.0 // indirect
33-
github.com/google/uuid v1.1.2 // indirect
33+
github.com/google/uuid v1.3.0 // indirect
3434
github.com/imdario/mergo v0.3.12 // indirect
3535
github.com/josharian/intern v1.0.0 // indirect
3636
github.com/json-iterator/go v1.1.12 // indirect
37-
github.com/mailru/easyjson v0.7.6 // indirect
38-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
37+
github.com/mailru/easyjson v0.7.7 // indirect
38+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
3939
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4040
github.com/modern-go/reflect2 v1.0.2 // indirect
4141
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4242
github.com/pkg/errors v0.9.1 // indirect
43-
github.com/prometheus/client_golang v1.14.0 // indirect
44-
github.com/prometheus/client_model v0.3.0 // indirect
45-
github.com/prometheus/common v0.37.0 // indirect
46-
github.com/prometheus/procfs v0.8.0 // indirect
43+
github.com/prometheus/client_golang v1.15.1 // indirect
44+
github.com/prometheus/client_model v0.4.0 // indirect
45+
github.com/prometheus/common v0.42.0 // indirect
46+
github.com/prometheus/procfs v0.9.0 // indirect
4747
github.com/spf13/pflag v1.0.5 // indirect
4848
go.uber.org/atomic v1.7.0 // indirect
4949
go.uber.org/multierr v1.6.0 // indirect
50-
golang.org/x/net v0.7.0 // indirect
51-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
52-
golang.org/x/sys v0.5.0 // indirect
53-
golang.org/x/term v0.5.0 // indirect
54-
golang.org/x/text v0.7.0 // indirect
50+
golang.org/x/net v0.10.0 // indirect
51+
golang.org/x/oauth2 v0.5.0 // indirect
52+
golang.org/x/sys v0.8.0 // indirect
53+
golang.org/x/term v0.8.0 // indirect
54+
golang.org/x/text v0.9.0 // indirect
5555
golang.org/x/time v0.3.0 // indirect
56-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
56+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
5757
google.golang.org/appengine v1.6.7 // indirect
58-
google.golang.org/protobuf v1.28.1 // indirect
58+
google.golang.org/protobuf v1.30.0 // indirect
5959
gopkg.in/inf.v0 v0.9.1 // indirect
6060
gopkg.in/yaml.v2 v2.4.0 // indirect
6161
gopkg.in/yaml.v3 v3.0.1 // indirect
62-
k8s.io/apiextensions-apiserver v0.26.3 // indirect
63-
k8s.io/component-base v0.26.3 // indirect
64-
k8s.io/klog/v2 v2.80.1 // indirect
65-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
66-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
67-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
62+
k8s.io/apiextensions-apiserver v0.27.2 // indirect
63+
k8s.io/component-base v0.27.2 // indirect
64+
k8s.io/klog/v2 v2.90.1 // indirect
65+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
66+
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
67+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6868
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
6969
)

0 commit comments

Comments
 (0)