chore: changes from bumping capi version

This includes bumping of related packages as well and any required code changes. Signed-off-by: Richard Case <[email protected]>
k3s-io · Feb 8, 2024 · a31130e · a31130e
1 parent b894015
commit a31130e
Show file tree

Hide file tree

Showing 18 changed files with 677 additions and 825 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -77,7 +77,7 @@ linters-settings:
  - k8s.io/apiserver
  - k8s.io/client-go
  - k8s.io/klog/v2
- - k8s.io/utils/pointer
+ - k8s.io/utils/ptr
 
  - github.com/onsi/ginkgo
  - github.com/onsi/gomega

diff --git a/Dockerfile b/Dockerfile
@@ -48,6 +48,7 @@ RUN --mount=type=cache,target=/root/.cache \
  -o manager ${package}
 
 FROM --platform=${BUILDPLATFORM} gcr.io/distroless/static:nonroot
+LABEL org.opencontainers.image.source=https://github.com/k3s-io/cluster-api-k3s
 WORKDIR /
 COPY --from=build /workspace/manager .
 # Use uid of nonroot user (65532) because kubernetes expects numeric user when applying pod security policies

diff --git a/Makefile b/Makefile
@@ -54,7 +54,7 @@ GOBIN=$(shell go env GOBIN)
 endif
 
 # Sync to controller-tools version in https://github.com/kubernetes-sigs/cluster-api/blob/v{VERSION}/hack/tools/go.mod
-CONTROLLER_GEN_VER := v0.12.1
+CONTROLLER_GEN_VER := v0.14.0
 CONTROLLER_GEN_BIN := controller-gen
 CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
 
@@ -63,24 +63,24 @@ ENVSUBST_VER := v2.0.0-20210730161058-179042472c46
 ENVSUBST_BIN := envsubst
 ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)
 
-ENVTEST_VER := latest
+ENVTEST_VER := v0.0.0-20231012212722-e25aeebc7846
 ENVTEST_BIN := setup-envtest
 ENVTEST := $(TOOLS_BIN_DIR)/$(ENVTEST_BIN)
-ENVTEST_K8S_VERSION = "1.26.0"
+ENVTEST_K8S_VERSION = "1.28.0"
 
 # Sync to github.com/drone/envsubst/v2 in https://github.com/kubernetes-sigs/cluster-api/blob/v{VERSION}/go.mod
 ENVSUBST_VER := v2.0.0-20210730161058-179042472c46
 ENVSUBST_BIN := envsubst
 ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)
 
 # Bump as necessary/desired to latest that supports our version of go at https://github.com/golangci/golangci-lint/releases
-GOLANGCI_LINT_VER := v1.53.3
+GOLANGCI_LINT_VER := v1.55.2
 GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
 
 # Keep at 4.0.4 until we figure out how to get later verisons to not mangle the calico yamls
 # HACK bump latest version once https://github.com/kubernetes-sigs/kustomize/issues/947 is fixed
-KUSTOMIZE_VER := v4.0.4
+KUSTOMIZE_VER := v4.5.2
 KUSTOMIZE_BIN := kustomize
 KUSTOMIZE := $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER)
 

diff --git a/bootstrap/api/v1beta1/zz_generated.deepcopy.go b/bootstrap/api/v1beta1/zz_generated.deepcopy.go
diff --git a/bootstrap/config/crd/bases/bootstrap.cluster.x-k8s.io_kthreesconfigs.yaml b/bootstrap/config/crd/bases/bootstrap.cluster.x-k8s.io_kthreesconfigs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
- controller-gen.kubebuilder.io/version: v0.12.1
+ controller-gen.kubebuilder.io/version: v0.14.0
  name: kthreesconfigs.bootstrap.cluster.x-k8s.io
 spec:
  group: bootstrap.cluster.x-k8s.io
@@ -20,14 +20,19 @@ spec:
  description: KThreesConfig is the Schema for the kthreesconfigs API.
  properties:
  apiVersion:
- description: 'APIVersion defines the versioned schema of this representation
- of an object. Servers should convert recognized schemas to the latest
- internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ description: |-
+ APIVersion defines the versioned schema of this representation of an object.
+ Servers should convert recognized schemas to the latest internal value, and
+ may reject unrecognized values.
+ More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
  type: string
  kind:
- description: 'Kind is a string value representing the REST resource this
- object represents. Servers may infer this from the endpoint the client
- submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ description: |-
+ Kind is a string value representing the REST resource this object represents.
+ Servers may infer this from the endpoint the client submits requests to.
+ Cannot be updated.
+ In CamelCase.
+ More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
  type: string
  metadata:
  type: object
@@ -62,9 +67,9 @@ spec:
  type: string
  type: array
  privateRegistry:
- description: 'TODO: take in a object or secret and write to file.
- this is not useful PrivateRegistry registry configuration file
- (default: "/etc/rancher/k3s/registries.yaml")'
+ description: |-
+ TODO: take in a object or secret and write to file. this is not useful
+ PrivateRegistry registry configuration file (default: "/etc/rancher/k3s/registries.yaml")
  type: string
  type: object
  files:
@@ -219,37 +224,37 @@ spec:
  operational state.
  properties:
  lastTransitionTime:
- description: Last time the condition transitioned from one status
- to another. This should be when the underlying condition changed.
- If that is not known, then using the time when the API field
- changed is acceptable.
+ description: |-
+ Last time the condition transitioned from one status to another.
+ This should be when the underlying condition changed. If that is not known, then using the time when
+ the API field changed is acceptable.
  format: date-time
  type: string
  message:
- description: A human readable message indicating details about
- the transition. This field may be empty.
+ description: |-
+ A human readable message indicating details about the transition.
+ This field may be empty.
  type: string
  reason:
- description: The reason for the condition's last transition
- in CamelCase. The specific API may choose whether or not this
- field is considered a guaranteed API. This field may not be
- empty.
+ description: |-
+ The reason for the condition's last transition in CamelCase.
+ The specific API may choose whether or not this field is considered a guaranteed API.
+ This field may not be empty.
  type: string
  severity:
- description: Severity provides an explicit classification of
- Reason code, so the users or machines can immediately understand
- the current situation and act accordingly. The Severity field
- MUST be set only when Status=False.
+ description: |-
+ Severity provides an explicit classification of Reason code, so the users or machines can immediately
+ understand the current situation and act accordingly.
+ The Severity field MUST be set only when Status=False.
  type: string
  status:
  description: Status of the condition, one of True, False, 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.
+ 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.
  type: string
  required:
  - lastTransitionTime

diff --git a/bootstrap/config/crd/bases/bootstrap.cluster.x-k8s.io_kthreesconfigtemplates.yaml b/bootstrap/config/crd/bases/bootstrap.cluster.x-k8s.io_kthreesconfigtemplates.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  annotations:
- controller-gen.kubebuilder.io/version: v0.12.1
+ controller-gen.kubebuilder.io/version: v0.14.0
  name: kthreesconfigtemplates.bootstrap.cluster.x-k8s.io
 spec:
  group: bootstrap.cluster.x-k8s.io
@@ -21,14 +21,19 @@ spec:
  API.
  properties:
  apiVersion:
- description: 'APIVersion defines the versioned schema of this representation
- of an object. Servers should convert recognized schemas to the latest
- internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ description: |-
+ APIVersion defines the versioned schema of this representation of an object.
+ Servers should convert recognized schemas to the latest internal value, and
+ may reject unrecognized values.
+ More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
  type: string
  kind:
- description: 'Kind is a string value representing the REST resource this
- object represents. Servers may infer this from the endpoint the client
- submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ description: |-
+ Kind is a string value representing the REST resource this object represents.
+ Servers may infer this from the endpoint the client submits requests to.
+ Cannot be updated.
+ In CamelCase.
+ More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
  type: string
  metadata:
  type: object
@@ -72,9 +77,9 @@ spec:
  type: string
  type: array
  privateRegistry:
- description: 'TODO: take in a object or secret and write
- to file. this is not useful PrivateRegistry registry
- configuration file (default: "/etc/rancher/k3s/registries.yaml")'
+ description: |-
+ TODO: take in a object or secret and write to file. this is not useful
+ PrivateRegistry registry configuration file (default: "/etc/rancher/k3s/registries.yaml")
  type: string
  type: object
  files: