Skip to content

Commit

Permalink
🌱 Bump CAPI Operator and other dependencies (#1062)
Browse files Browse the repository at this point in the history
* Bump CAPI Operator to v0.16.0

Signed-off-by: Furkat Gofurov <[email protected]>

* Bump go version to 1.23.0

Signed-off-by: Furkat Gofurov <[email protected]>

* Run 'make generate' and 'make build-chart' to regenerate manifests

Signed-off-by: Furkat Gofurov <[email protected]>

* Bump golint version and code fixes

Signed-off-by: Furkat Gofurov <[email protected]>

---------

Signed-off-by: Furkat Gofurov <[email protected]>
  • Loading branch information
furkatgofurov7 authored Jan 29, 2025
1 parent cafb7ec commit 16826a3
Show file tree
Hide file tree
Showing 29 changed files with 84 additions and 67 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: setupGo
uses: actions/[email protected]
with:
go-version: '=1.22.10'
go-version: '=1.23.0'
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@5a083d0e9a84784eb32078397cf5459adecb4c40 # tag=v3.5.0
with:
go-version: 1.22.10
go-version: 1.23.0
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-image-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: setupGo
uses: actions/[email protected]
with:
go-version: "=1.22.10"
go-version: "=1.23.0"
- name: Docker login
uses: docker/login-action@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-short.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: setupGo
uses: actions/[email protected]
with:
go-version: "=1.22.10"
go-version: "=1.23.0"
- name: Cache Docker layers
uses: actions/cache@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/[email protected]
with:
go-version: '=1.22.10'
go-version: '=1.23.0'
- name: golangci-lint
uses: golangci/[email protected]
with:
version: v1.56.2
version: v1.60.2
working-directory: ${{matrix.working-directory}}
args: --timeout=5m0s
skip-cache: true
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/[email protected]
with:
go-version: 1.22.10
go-version: 1.23.0
- name: Lint
run: make lint
2 changes: 1 addition & 1 deletion .github/workflows/nightly-test-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
- name: setupGo
uses: actions/[email protected]
with:
go-version: '=1.22.10'
go-version: '=1.23.0'
- name: Package operator chart
run: RELEASE_TAG=${{ env.RELEASE_TAG }} CHART_PACKAGE_DIR=${RELEASE_DIR} REGISTRY=${{ env.PROD_REGISTRY }} ORG=${{ env.PROD_ORG }} make release

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: setupGo
uses: actions/[email protected]
with:
go-version: '=1.22.10'
go-version: '=1.23.0'
- name: Get prod multiarch image digest
run: |
docker pull ${{ env.CONTROLLER_IMG }}:${{ env.TAG }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ runs:
- name: setupGo
uses: actions/setup-go@v4
with:
go-version: "=1.22.10"
go-version: "=1.23.0"
- name: Docker login to ghcr registry
uses: docker/login-action@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-e2e-suite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
- name: setupGo
uses: actions/[email protected]
with:
go-version: "=1.22.10"
go-version: "=1.23.0"
- name: Docker login
uses: docker/login-action@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: setupGo
uses: actions/[email protected]
with:
go-version: '=1.22.10'
go-version: '=1.23.0'

- name: Build docker image
run: make docker-build
Expand Down
1 change: 1 addition & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ linters:
- gocritic
- nlreturn
- gomnd
- mnd
- ireturn
- depguard
- containedctx
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ else
UPDATECLI_OS = Darwin
endif

GO_VERSION ?= 1.22.10
GO_VERSION ?= 1.23.0
GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
REPO ?= rancher/turtles

Expand Down Expand Up @@ -157,7 +157,7 @@ CLUSTERCTL_VER := v1.7.7
CLUSTERCTL_BIN := clusterctl
CLUSTERCTL := $(TOOLS_BIN_DIR)/$(CLUSTERCTL_BIN)-$(CLUSTERCTL_VER)

GOLANGCI_LINT_VER := v1.56.2
GOLANGCI_LINT_VER := v1.60.2
GOLANGCI_LINT_BIN := golangci-lint
GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN))

Expand Down
2 changes: 1 addition & 1 deletion charts/rancher-turtles/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ keywords:
- provisioning
dependencies:
- name: cluster-api-operator
version: v0.15.1
version: v0.16.0
repository: https://kubernetes-sigs.github.io/cluster-api-operator
condition: cluster-api-operator.enabled
annotations:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2803,6 +2803,12 @@ spec:
For example, the infrastructure name `aws` will fetch artifacts from
https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases.
properties:
oci:
description: |-
OCI to be used for fetching the provider’s components and metadata from an OCI artifact.
You must set `providerSpec.Version` field for operator to pick up desired version of the release from GitHub.
If the providerSpec.Version is missing, latest provider version from clusterctl defaults is used.
type: string
selector:
description: |-
Selector to be used for fetching provider’s components and metadata from
Expand Down Expand Up @@ -2862,6 +2868,9 @@ spec:
desired version of the release from GitHub.
type: string
type: object
x-kubernetes-validations:
- message: Must specify one and only one of {oci, url, selector}
rule: '[has(self.oci), has(self.url), has(self.selector)].exists_one(x,x)'
manager:
description: Manager defines the properties that can be enabled on
the controller manager for the provider.
Expand Down
9 changes: 9 additions & 0 deletions config/crd/bases/turtles-capi.cattle.io_capiproviders.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2803,6 +2803,12 @@ spec:
For example, the infrastructure name `aws` will fetch artifacts from
https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases.
properties:
oci:
description: |-
OCI to be used for fetching the provider’s components and metadata from an OCI artifact.
You must set `providerSpec.Version` field for operator to pick up desired version of the release from GitHub.
If the providerSpec.Version is missing, latest provider version from clusterctl defaults is used.
type: string
selector:
description: |-
Selector to be used for fetching provider’s components and metadata from
Expand Down Expand Up @@ -2862,6 +2868,9 @@ spec:
desired version of the release from GitHub.
type: string
type: object
x-kubernetes-validations:
- message: Must specify one and only one of {oci, url, selector}
rule: '[has(self.oci), has(self.url), has(self.selector)].exists_one(x,x)'
manager:
description: Manager defines the properties that can be enabled on
the controller manager for the provider.
Expand Down
2 changes: 1 addition & 1 deletion exp/clusterclass/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/rancher/turtles/exp/clusterclass

go 1.22.10
go 1.23.0

require (
github.com/go-logr/logr v1.4.2
Expand Down
10 changes: 5 additions & 5 deletions exp/etcdrestore/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/rancher/turtles/exp/etcdrestore

go 1.22.10
go 1.23.0

replace github.com/rancher/turtles => ../..

Expand All @@ -17,7 +17,7 @@ require (
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
sigs.k8s.io/cluster-api v1.9.4
sigs.k8s.io/cluster-api-operator v0.15.1
sigs.k8s.io/cluster-api-operator v0.16.0
sigs.k8s.io/controller-runtime v0.19.4
)

Expand Down Expand Up @@ -71,10 +71,10 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.7.0 // indirect
golang.org/x/tools v0.28.0 // indirect
Expand Down
20 changes: 10 additions & 10 deletions exp/etcdrestore/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
Expand All @@ -216,8 +216,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand All @@ -228,10 +228,10 @@ golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
Expand Down Expand Up @@ -296,8 +296,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsA
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
sigs.k8s.io/cluster-api v1.9.4 h1:pa2Ho50F9Js/Vv/Jy11TcpmGiqY2ukXCoDj/dY25Y7M=
sigs.k8s.io/cluster-api v1.9.4/go.mod h1:9DjpPCxJJo7/mH+KceINNJHr9c5X9S9HEp2B8JG3Uv8=
sigs.k8s.io/cluster-api-operator v0.15.1 h1:oGEqNE7c1Ieqwso/DwjRVD2b/7wFXIjEKAodlwsO6/Q=
sigs.k8s.io/cluster-api-operator v0.15.1/go.mod h1:0yvW+1BLHcE5/gQfWSin1L4Gj+8wa9y7+vVTXOhUnSg=
sigs.k8s.io/cluster-api-operator v0.16.0 h1:q19kIYLPCHjXdXGgLjEDAuBslJs8AkIp3JBVkGR9KBE=
sigs.k8s.io/cluster-api-operator v0.16.0/go.mod h1:2TraYRvf4Os2vuB6HQhSwDMJATmnNAuCuLQZNj460U8=
sigs.k8s.io/controller-runtime v0.19.4 h1:SUmheabttt0nx8uJtoII4oIP27BVVvAKFvdvGFwV/Qo=
sigs.k8s.io/controller-runtime v0.19.4/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
Expand Down
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/rancher/turtles

go 1.22.10
go 1.23.0

require (
github.com/blang/semver/v4 v4.0.0
Expand All @@ -18,7 +18,7 @@ require (
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
sigs.k8s.io/cluster-api v1.9.4
sigs.k8s.io/cluster-api-operator v0.15.1
sigs.k8s.io/cluster-api-operator v0.16.0
sigs.k8s.io/controller-runtime v0.19.4
sigs.k8s.io/yaml v1.4.0
)
Expand Down Expand Up @@ -61,10 +61,10 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/time v0.7.0 // indirect
golang.org/x/tools v0.28.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
Expand Down
20 changes: 10 additions & 10 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
Expand All @@ -195,8 +195,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand All @@ -207,10 +207,10 @@ golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
Expand Down Expand Up @@ -275,8 +275,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsA
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
sigs.k8s.io/cluster-api v1.9.4 h1:pa2Ho50F9Js/Vv/Jy11TcpmGiqY2ukXCoDj/dY25Y7M=
sigs.k8s.io/cluster-api v1.9.4/go.mod h1:9DjpPCxJJo7/mH+KceINNJHr9c5X9S9HEp2B8JG3Uv8=
sigs.k8s.io/cluster-api-operator v0.15.1 h1:oGEqNE7c1Ieqwso/DwjRVD2b/7wFXIjEKAodlwsO6/Q=
sigs.k8s.io/cluster-api-operator v0.15.1/go.mod h1:0yvW+1BLHcE5/gQfWSin1L4Gj+8wa9y7+vVTXOhUnSg=
sigs.k8s.io/cluster-api-operator v0.16.0 h1:q19kIYLPCHjXdXGgLjEDAuBslJs8AkIp3JBVkGR9KBE=
sigs.k8s.io/cluster-api-operator v0.16.0/go.mod h1:2TraYRvf4Os2vuB6HQhSwDMJATmnNAuCuLQZNj460U8=
sigs.k8s.io/controller-runtime v0.19.4 h1:SUmheabttt0nx8uJtoII4oIP27BVVvAKFvdvGFwV/Qo=
sigs.k8s.io/controller-runtime v0.19.4/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
Expand Down
2 changes: 1 addition & 1 deletion go.work.example
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.22.10
go 1.23.0

use (
./rancher-turtles
Expand Down
1 change: 0 additions & 1 deletion internal/controllers/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ func namespaceToCapiClusters(ctx context.Context, clusterPredicate predicate.Fun
reqs := []ctrl.Request{}

for _, cluster := range capiClusters.Items {
cluster := cluster
if !clusterPredicate.Generic(event.GenericEvent{Object: &cluster}) {
continue
}
Expand Down
1 change: 0 additions & 1 deletion internal/sync/provider_sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ func (s *ProviderSync) SyncObjects() {
s.Source.Status.Conditions = oldConditions

for _, condition := range newConditions {
condition := condition
conditions.Set(s.Source, &condition)
}

Expand Down
6 changes: 3 additions & 3 deletions internal/sync/secret_mapper_sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ func (s *SecretMapperSync) Get(ctx context.Context) error {
continue
}

secret := secret
secret := secret //nolint:copyloopvar
s.RancherSecret = &secret

return s.SecretSync.Get(ctx)
Expand All @@ -278,7 +278,7 @@ func (s *SecretMapperSync) Get(ctx context.Context) error {
turtlesv1.RancherCredentialsSecretCondition,
turtlesv1.RancherCredentialSourceMissing,
clusterv1.ConditionSeverityError,
fmt.Sprintf(missingSource, cmp.Or(
"%s", fmt.Sprintf(missingSource, cmp.Or(
s.Source.Spec.Credentials.RancherCloudCredential,
s.Source.Spec.Credentials.RancherCloudCredentialNamespaceName)),
))
Expand All @@ -298,7 +298,7 @@ func (s *SecretMapperSync) Sync(ctx context.Context) error {
turtlesv1.RancherCredentialsSecretCondition,
turtlesv1.RancherCredentialKeyMissing,
clusterv1.ConditionSeverityError,
fmt.Sprintf(missingKey, err.Error()),
"%s", fmt.Sprintf(missingKey, err.Error()),
))

return nil
Expand Down
Loading

0 comments on commit 16826a3

Please sign in to comment.