Skip to content

Commit 582d376

Browse files
committed
chore: bump Cluster API to v1.5
1 parent 0127276 commit 582d376

24 files changed

+246
-286
lines changed

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v3
1515
- uses: actions/setup-go@v4
1616
with:
17-
go-version: '1.19'
17+
go-version: '1.20'
1818
- name: golangci-lint
1919
uses: golangci/golangci-lint-action@v3
2020
with:

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Go
2323
uses: actions/setup-go@v4
2424
with:
25-
go-version: '1.19'
25+
go-version: '1.20'
2626
- name: Generate release artifacts
2727
run: |
2828
make release

.golangci.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
run:
22
timeout: 5m
3-
go: "1.19"
3+
go: "1.20"
44
skip-files:
55
- "zz_generated.*\\.go$"
66
allow-parallel-runners: true
@@ -144,6 +144,9 @@ issues:
144144
- "missing cases in switch of type v1.PlatformType: (\\.*)"
145145
exclude-use-default: false
146146
exclude-rules:
147+
- linters:
148+
- staticcheck
149+
text: "SA1019: (\"sigs.k8s.io/controller-runtime/pkg/config/v1alpha1\"|ctrlconfigv1.*) is deprecated: The component config package has been deprecated and will be removed in a future release."
147150
# Exclude some linters from running on tests files.
148151
- path: _test\.go
149152
linters:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616

1717
# Build the manager binary
18-
FROM golang:1.19.0 as builder
18+
FROM golang:1.20.0 as builder
1919
WORKDIR /workspace
2020

2121
# Run this with docker build --build-arg goproxy=$(go env GOPROXY) to override the goproxy

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ modules: ## Runs go mod to ensure modules are up to date.
318318
.PHONY: docker-pull-prerequisites
319319
docker-pull-prerequisites:
320320
docker pull docker.io/docker/dockerfile:1.4
321-
docker pull docker.io/library/golang:1.19.0
321+
docker pull docker.io/library/golang:1.20.0
322322
docker pull gcr.io/distroless/static:latest
323323

324324
.PHONY: docker-build

cmd/main.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package main
1919
import (
2020
"flag"
2121
"fmt"
22-
"math/rand"
2322
"net/http"
2423
"os"
2524
"time"
@@ -113,8 +112,6 @@ func InitFlags(fs *pflag.FlagSet) {
113112
}
114113

115114
func main() {
116-
rand.Seed(time.Now().UnixNano())
117-
118115
InitFlags(pflag.CommandLine)
119116
pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
120117
pflag.Parse()

config/crd/bases/operator.cluster.x-k8s.io_bootstrapproviders.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ spec:
10821082
in spec.resourceClaims, that are used by this container.
10831083
\n This is an alpha field and requires enabling the
10841084
DynamicResourceAllocation feature gate. \n This field
1085-
is immutable."
1085+
is immutable. It can only be set for containers."
10861086
items:
10871087
description: ResourceClaim references one entry in
10881088
PodSpec.ResourceClaims.
@@ -1121,7 +1121,7 @@ spec:
11211121
of compute resources required. If Requests is omitted
11221122
for a container, it defaults to Limits if that is
11231123
explicitly specified, otherwise to an implementation-defined
1124-
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
1124+
value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
11251125
type: object
11261126
type: object
11271127
required:
@@ -1392,7 +1392,7 @@ spec:
13921392
minimum: 1
13931393
type: integer
13941394
metrics:
1395-
description: Metrics contains thw controller metrics configuration
1395+
description: Metrics contains the controller metrics configuration
13961396
properties:
13971397
bindAddress:
13981398
description: BindAddress is the TCP address that the controller

config/crd/bases/operator.cluster.x-k8s.io_controlplaneproviders.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,7 @@ spec:
10831083
in spec.resourceClaims, that are used by this container.
10841084
\n This is an alpha field and requires enabling the
10851085
DynamicResourceAllocation feature gate. \n This field
1086-
is immutable."
1086+
is immutable. It can only be set for containers."
10871087
items:
10881088
description: ResourceClaim references one entry in
10891089
PodSpec.ResourceClaims.
@@ -1122,7 +1122,7 @@ spec:
11221122
of compute resources required. If Requests is omitted
11231123
for a container, it defaults to Limits if that is
11241124
explicitly specified, otherwise to an implementation-defined
1125-
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
1125+
value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
11261126
type: object
11271127
type: object
11281128
required:
@@ -1393,7 +1393,7 @@ spec:
13931393
minimum: 1
13941394
type: integer
13951395
metrics:
1396-
description: Metrics contains thw controller metrics configuration
1396+
description: Metrics contains the controller metrics configuration
13971397
properties:
13981398
bindAddress:
13991399
description: BindAddress is the TCP address that the controller

config/crd/bases/operator.cluster.x-k8s.io_coreproviders.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ spec:
10821082
in spec.resourceClaims, that are used by this container.
10831083
\n This is an alpha field and requires enabling the
10841084
DynamicResourceAllocation feature gate. \n This field
1085-
is immutable."
1085+
is immutable. It can only be set for containers."
10861086
items:
10871087
description: ResourceClaim references one entry in
10881088
PodSpec.ResourceClaims.
@@ -1121,7 +1121,7 @@ spec:
11211121
of compute resources required. If Requests is omitted
11221122
for a container, it defaults to Limits if that is
11231123
explicitly specified, otherwise to an implementation-defined
1124-
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
1124+
value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
11251125
type: object
11261126
type: object
11271127
required:
@@ -1392,7 +1392,7 @@ spec:
13921392
minimum: 1
13931393
type: integer
13941394
metrics:
1395-
description: Metrics contains thw controller metrics configuration
1395+
description: Metrics contains the controller metrics configuration
13961396
properties:
13971397
bindAddress:
13981398
description: BindAddress is the TCP address that the controller

config/crd/bases/operator.cluster.x-k8s.io_infrastructureproviders.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,7 @@ spec:
10831083
in spec.resourceClaims, that are used by this container.
10841084
\n This is an alpha field and requires enabling the
10851085
DynamicResourceAllocation feature gate. \n This field
1086-
is immutable."
1086+
is immutable. It can only be set for containers."
10871087
items:
10881088
description: ResourceClaim references one entry in
10891089
PodSpec.ResourceClaims.
@@ -1122,7 +1122,7 @@ spec:
11221122
of compute resources required. If Requests is omitted
11231123
for a container, it defaults to Limits if that is
11241124
explicitly specified, otherwise to an implementation-defined
1125-
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
1125+
value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
11261126
type: object
11271127
type: object
11281128
required:
@@ -1393,7 +1393,7 @@ spec:
13931393
minimum: 1
13941394
type: integer
13951395
metrics:
1396-
description: Metrics contains thw controller metrics configuration
1396+
description: Metrics contains the controller metrics configuration
13971397
properties:
13981398
bindAddress:
13991399
description: BindAddress is the TCP address that the controller

0 commit comments

Comments
 (0)