diff --git a/Makefile b/Makefile index 9deeae2..8af457e 100644 --- a/Makefile +++ b/Makefile @@ -178,8 +178,8 @@ GEN_CRD_API_REFERENCE_DOCS ?= $(LOCALBIN)/gen-crd-api-reference-docs-$(GEN_CRD_A KUSTOMIZE_VERSION ?= v5.4.1 KUBECTL_VERSION ?= v1.31.1 HELM_VERSION ?= v3.15.3 -CONTROLLER_TOOLS_VERSION ?= v0.15.0 -ENVTEST_VERSION ?= release-0.18 +CONTROLLER_TOOLS_VERSION ?= v0.16.3 +ENVTEST_VERSION ?= latest ENVSUBST_VER := v1.2.0 GOLANGCI_LINT_VERSION ?= v1.61.0 GEN_CRD_API_REFERENCE_DOCS_VERSION ?= v0.3.0 diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml index e162646..a2a7a93 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.3 name: metalclusters.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml index cbbb383..936b1c5 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.3 name: metalmachines.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -106,7 +106,6 @@ spec: reconciling the Machine and will contain a more verbose string suitable for logging and human consumption. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -116,7 +115,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of Machines can be added as events to the Machine object and/or logged in the controller's output. @@ -127,7 +125,6 @@ spec: reconciling the Machine and will contain a succinct value suitable for machine interpretation. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -137,7 +134,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of Machines can be added as events to the Machine object and/or logged in the controller's output. diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachinetemplates.yaml index e0427c8..1db8cd8 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachinetemplates.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachinetemplates.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.3 name: metalmachinetemplates.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 1663c84..2edc1e3 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -32,6 +32,9 @@ rules: resources: - clusters - clusters/status + - machines + - machines/status + - machinesets verbs: - get - list @@ -40,17 +43,6 @@ rules: - cluster.x-k8s.io resources: - kubeadmcontrolplanes - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - cluster.x-k8s.io - resources: - machinedeployments verbs: - create @@ -60,52 +52,10 @@ rules: - patch - update - watch -- apiGroups: - - cluster.x-k8s.io - resources: - - machines - - machines/status - verbs: - - get - - list - - watch -- apiGroups: - - cluster.x-k8s.io - resources: - - machinesets - verbs: - - get - - list - - watch - apiGroups: - infrastructure.cluster.x-k8s.io resources: - metalclusters - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - metalclusters/finalizers - verbs: - - update -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - metalclusters/status - verbs: - - get - - patch - - update -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - metalmachines verbs: - create @@ -118,12 +68,14 @@ rules: - apiGroups: - infrastructure.cluster.x-k8s.io resources: + - metalclusters/finalizers - metalmachines/finalizers verbs: - update - apiGroups: - infrastructure.cluster.x-k8s.io resources: + - metalclusters/status - metalmachines/status verbs: - get diff --git a/docs/api-reference/api.md b/docs/api-reference/api.md index ab1210c..3e89af9 100644 --- a/docs/api-reference/api.md +++ b/docs/api-reference/api.md @@ -27,7 +27,7 @@ Resource Types: metadata
- + Kubernetes meta/v1.ObjectMeta @@ -168,7 +168,7 @@ sigs.k8s.io/cluster-api/api/v1beta1.Conditions metadata
- + Kubernetes meta/v1.ObjectMeta @@ -218,7 +218,7 @@ string serverSelector
- + Kubernetes meta/v1.LabelSelector @@ -289,7 +289,7 @@ string serverSelector
- + Kubernetes meta/v1.LabelSelector @@ -399,7 +399,7 @@ controller’s output.

metadata
- + Kubernetes meta/v1.ObjectMeta @@ -510,7 +510,7 @@ string serverSelector
- + Kubernetes meta/v1.LabelSelector diff --git a/hack/api-reference/config.json b/hack/api-reference/config.json index 65d4cf1..80e79d8 100644 --- a/hack/api-reference/config.json +++ b/hack/api-reference/config.json @@ -21,7 +21,7 @@ }, { "typeMatchPrefix": "^k8s\\.io/(api|apimachinery/pkg/apis)/", - "docsURLTemplate": "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#{{lower .TypeIdentifier}}-{{arrIndex .PackageSegments -1}}-{{arrIndex .PackageSegments -2}}" + "docsURLTemplate": "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#{{lower .TypeIdentifier}}-{{arrIndex .PackageSegments -1}}-{{arrIndex .PackageSegments -2}}" } ], "typeDisplayNamePrefixOverrides": { diff --git a/hack/boilerplate.go.txt b/hack/boilerplate.go.txt index ff72ff2..20ebd9a 100644 --- a/hack/boilerplate.go.txt +++ b/hack/boilerplate.go.txt @@ -1,15 +1,2 @@ -/* -Copyright 2024. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ \ No newline at end of file +// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and IronCore contributors +// SPDX-License-Identifier: Apache-2.0