Skip to content

Commit ac01ed9

Browse files
gianlucam76gianlucam76
authored
Merge pull request #1564 from gianlucam76/kind
(deps) Advance kind to v0.31.0
2 parents 7c3d04f + a27bacd commit ac01ed9

18 files changed

+152
-162
lines changed

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ KIND := $(TOOLS_BIN_DIR)/kind
7272
KUBECTL := $(TOOLS_BIN_DIR)/kubectl
7373

7474
GOVULNCHECK_VERSION := "v1.1.4"
75-
GOLANGCI_LINT_VERSION := "v2.5.0"
76-
CLUSTERCTL_VERSION := v1.12.0
75+
GOLANGCI_LINT_VERSION := "v2.7.2"
76+
CLUSTERCTL_VERSION := v1.12.1
7777

7878
KUSTOMIZE_VER := v5.7.0
7979
KUSTOMIZE_BIN := kustomize
@@ -194,7 +194,7 @@ endif
194194
# K8S_VERSION for the Kind cluster can be set as environment variable. If not defined,
195195
# this default value is used
196196
ifndef K8S_VERSION
197-
K8S_VERSION := v1.34.0
197+
K8S_VERSION := v1.35.0
198198
endif
199199

200200
KIND_CONFIG ?= kind-cluster.yaml

‎api/v1beta1/clustersummary_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ type FeatureSummary struct {
6969
// DeployedGroupVersionKind contains all GroupVersionKinds deployed in either
7070
// the workload cluster or the management cluster because of this feature.
7171
// Each element has format kind.version.group
72+
//
7273
// Deprecated: Replaced by FeatureDeploymentInfo field instead
7374
// +optional
7475
DeployedGroupVersionKind []string `json:"deployedGroupVersionKind,omitempty"`

‎api/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/config.projectsveltos.io_clusterconfigurations.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.19.0
6+
controller-gen.kubebuilder.io/version: v0.20.0
77
name: clusterconfigurations.config.projectsveltos.io
88
spec:
99
group: config.projectsveltos.io

‎config/crd/bases/config.projectsveltos.io_clusterprofiles.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.19.0
6+
controller-gen.kubebuilder.io/version: v0.20.0
77
name: clusterprofiles.config.projectsveltos.io
88
spec:
99
group: config.projectsveltos.io

‎config/crd/bases/config.projectsveltos.io_clusterpromotions.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.19.0
6+
controller-gen.kubebuilder.io/version: v0.20.0
77
name: clusterpromotions.config.projectsveltos.io
88
spec:
99
group: config.projectsveltos.io

‎config/crd/bases/config.projectsveltos.io_clusterreports.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.19.0
6+
controller-gen.kubebuilder.io/version: v0.20.0
77
name: clusterreports.config.projectsveltos.io
88
spec:
99
group: config.projectsveltos.io

‎config/crd/bases/config.projectsveltos.io_clustersummaries.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.19.0
6+
controller-gen.kubebuilder.io/version: v0.20.0
77
name: clustersummaries.config.projectsveltos.io
88
spec:
99
group: config.projectsveltos.io
@@ -1318,6 +1318,7 @@ spec:
13181318
DeployedGroupVersionKind contains all GroupVersionKinds deployed in either
13191319
the workload cluster or the management cluster because of this feature.
13201320
Each element has format kind.version.group
1321+
13211322
Deprecated: Replaced by FeatureDeploymentInfo field instead
13221323
items:
13231324
type: string

‎config/crd/bases/config.projectsveltos.io_profiles.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.19.0
6+
controller-gen.kubebuilder.io/version: v0.20.0
77
name: profiles.config.projectsveltos.io
88
spec:
99
group: config.projectsveltos.io

‎controllers/handlers_utils.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,9 @@ func getDeployedGroupVersionKinds(clusterSummary *configv1beta1.ClusterSummary,
10731073
// New code set only FeatureDeploymentInfo
10741074
fs := getFeatureSummaryForFeatureID(clusterSummary, featureID)
10751075
if fs != nil {
1076+
//nolint:staticcheck // using for backward compatibility
10761077
for j := range fs.DeployedGroupVersionKind {
1078+
//nolint:staticcheck // using for backward compatibility
10771079
gvk, _ := schema.ParseKindArg(fs.DeployedGroupVersionKind[j])
10781080
gvks = append(gvks, *gvk)
10791081
}

0 commit comments

Comments
 (0)