diff --git a/config/crd/bases/config.projectsveltos.io_clusterconfigurations.yaml b/config/crd/bases/config.projectsveltos.io_clusterconfigurations.yaml index de5cdc31..32053d05 100644 --- a/config/crd/bases/config.projectsveltos.io_clusterconfigurations.yaml +++ b/config/crd/bases/config.projectsveltos.io_clusterconfigurations.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.20.0 + controller-gen.kubebuilder.io/version: v0.20.1 name: clusterconfigurations.config.projectsveltos.io spec: group: config.projectsveltos.io diff --git a/config/crd/bases/config.projectsveltos.io_clusterprofiles.yaml b/config/crd/bases/config.projectsveltos.io_clusterprofiles.yaml index b0cb5d86..c57f8380 100644 --- a/config/crd/bases/config.projectsveltos.io_clusterprofiles.yaml +++ b/config/crd/bases/config.projectsveltos.io_clusterprofiles.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.20.0 + controller-gen.kubebuilder.io/version: v0.20.1 name: clusterprofiles.config.projectsveltos.io spec: group: config.projectsveltos.io diff --git a/config/crd/bases/config.projectsveltos.io_clusterpromotions.yaml b/config/crd/bases/config.projectsveltos.io_clusterpromotions.yaml index 114f1a7a..f70779a9 100644 --- a/config/crd/bases/config.projectsveltos.io_clusterpromotions.yaml +++ b/config/crd/bases/config.projectsveltos.io_clusterpromotions.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.20.0 + controller-gen.kubebuilder.io/version: v0.20.1 name: clusterpromotions.config.projectsveltos.io spec: group: config.projectsveltos.io diff --git a/config/crd/bases/config.projectsveltos.io_clusterreports.yaml b/config/crd/bases/config.projectsveltos.io_clusterreports.yaml index 79cdc30e..07e7732d 100644 --- a/config/crd/bases/config.projectsveltos.io_clusterreports.yaml +++ b/config/crd/bases/config.projectsveltos.io_clusterreports.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.20.0 + controller-gen.kubebuilder.io/version: v0.20.1 name: clusterreports.config.projectsveltos.io spec: group: config.projectsveltos.io diff --git a/config/crd/bases/config.projectsveltos.io_clustersummaries.yaml b/config/crd/bases/config.projectsveltos.io_clustersummaries.yaml index a0b41208..53580ecf 100644 --- a/config/crd/bases/config.projectsveltos.io_clustersummaries.yaml +++ b/config/crd/bases/config.projectsveltos.io_clustersummaries.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.20.0 + controller-gen.kubebuilder.io/version: v0.20.1 name: clustersummaries.config.projectsveltos.io spec: group: config.projectsveltos.io diff --git a/config/crd/bases/config.projectsveltos.io_profiles.yaml b/config/crd/bases/config.projectsveltos.io_profiles.yaml index 8aed3943..36c52106 100644 --- a/config/crd/bases/config.projectsveltos.io_profiles.yaml +++ b/config/crd/bases/config.projectsveltos.io_profiles.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.20.0 + controller-gen.kubebuilder.io/version: v0.20.1 name: profiles.config.projectsveltos.io spec: group: config.projectsveltos.io diff --git a/controllers/resourcesummary.go b/controllers/resourcesummary.go index fb2551f6..53bd1284 100644 --- a/controllers/resourcesummary.go +++ b/controllers/resourcesummary.go @@ -388,6 +388,7 @@ func deployUnstructuredResources(ctx context.Context, restConfig *rest.Config, options := metav1.ApplyOptions{ FieldManager: "application/apply-patch", + Force: true, } _, err = dr.Apply(ctx, policy.GetName(), policy, options) diff --git a/hack/tools/go.mod b/hack/tools/go.mod index 6ec35951..bfe5377e 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -8,7 +8,7 @@ require ( golang.org/x/oauth2 v0.35.0 golang.org/x/tools v0.42.0 k8s.io/client-go v0.35.1 - sigs.k8s.io/controller-tools v0.20.0 + sigs.k8s.io/controller-tools v0.20.1 sigs.k8s.io/kind v0.31.0 ) diff --git a/hack/tools/go.sum b/hack/tools/go.sum index d592ae81..ebfb6f2a 100644 --- a/hack/tools/go.sum +++ b/hack/tools/go.sum @@ -260,8 +260,8 @@ k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzk k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= -sigs.k8s.io/controller-tools v0.20.0 h1:VWZF71pwSQ2lZZCt7hFGJsOfDc5dVG28/IysjjMWXL8= -sigs.k8s.io/controller-tools v0.20.0/go.mod h1:b4qPmjGU3iZwqn34alUU5tILhNa9+VXK+J3QV0fT/uU= +sigs.k8s.io/controller-tools v0.20.1 h1:gkfMt9YodI0K85oT8rVi80NTXO/kDmabKR5Ajn5GYxs= +sigs.k8s.io/controller-tools v0.20.1/go.mod h1:b4qPmjGU3iZwqn34alUU5tILhNa9+VXK+J3QV0fT/uU= sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg= sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= sigs.k8s.io/kind v0.31.0 h1:UcT4nzm+YM7YEbqiAKECk+b6dsvc/HRZZu9U0FolL1g= diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index 8fcce8c6..d14f966b 100644 --- a/manifest/manifest.yaml +++ b/manifest/manifest.yaml @@ -7,7 +7,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.20.0 + controller-gen.kubebuilder.io/version: v0.20.1 name: clusterconfigurations.config.projectsveltos.io spec: group: config.projectsveltos.io @@ -312,7 +312,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.20.0 + controller-gen.kubebuilder.io/version: v0.20.1 name: clusterprofiles.config.projectsveltos.io spec: group: config.projectsveltos.io @@ -2053,7 +2053,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.20.0 + controller-gen.kubebuilder.io/version: v0.20.1 name: clusterpromotions.config.projectsveltos.io spec: group: config.projectsveltos.io @@ -3826,7 +3826,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.20.0 + controller-gen.kubebuilder.io/version: v0.20.1 name: clusterreports.config.projectsveltos.io spec: group: config.projectsveltos.io @@ -4132,7 +4132,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.20.0 + controller-gen.kubebuilder.io/version: v0.20.1 name: clustersummaries.config.projectsveltos.io spec: group: config.projectsveltos.io @@ -5834,7 +5834,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.20.0 + controller-gen.kubebuilder.io/version: v0.20.1 name: profiles.config.projectsveltos.io spec: group: config.projectsveltos.io diff --git a/pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.go b/pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.go index 7b4acad5..5c7ab49f 100644 --- a/pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.go +++ b/pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.go @@ -47,7 +47,7 @@ spec: - --version=main command: - /manager - image: docker.io/projectsveltos/drift-detection-manager@sha256:bc677632bc882102535e10b52454ef595fbb6efe7bb37b14b870c4a3a4fd3d82 + image: docker.io/projectsveltos/drift-detection-manager@sha256:ff32d9cc6bb9625df547a69b87892f865556a3f3a5421f5fce1dbb57b1b13b66 livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.yaml b/pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.yaml index d63096fa..735bbc63 100644 --- a/pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.yaml +++ b/pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.yaml @@ -29,7 +29,7 @@ spec: - --version=main command: - /manager - image: docker.io/projectsveltos/drift-detection-manager@sha256:bc677632bc882102535e10b52454ef595fbb6efe7bb37b14b870c4a3a4fd3d82 + image: docker.io/projectsveltos/drift-detection-manager@sha256:ff32d9cc6bb9625df547a69b87892f865556a3f3a5421f5fce1dbb57b1b13b66 livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/drift-detection/drift-detection-manager.go b/pkg/drift-detection/drift-detection-manager.go index e732295d..b4e1eb04 100644 --- a/pkg/drift-detection/drift-detection-manager.go +++ b/pkg/drift-detection/drift-detection-manager.go @@ -158,7 +158,7 @@ spec: valueFrom: resourceFieldRef: resource: limits.cpu - image: docker.io/projectsveltos/drift-detection-manager@sha256:bc677632bc882102535e10b52454ef595fbb6efe7bb37b14b870c4a3a4fd3d82 + image: docker.io/projectsveltos/drift-detection-manager@sha256:ff32d9cc6bb9625df547a69b87892f865556a3f3a5421f5fce1dbb57b1b13b66 livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/drift-detection/drift-detection-manager.yaml b/pkg/drift-detection/drift-detection-manager.yaml index ff26c522..d5d57ac5 100644 --- a/pkg/drift-detection/drift-detection-manager.yaml +++ b/pkg/drift-detection/drift-detection-manager.yaml @@ -140,7 +140,7 @@ spec: valueFrom: resourceFieldRef: resource: limits.cpu - image: docker.io/projectsveltos/drift-detection-manager@sha256:bc677632bc882102535e10b52454ef595fbb6efe7bb37b14b870c4a3a4fd3d82 + image: docker.io/projectsveltos/drift-detection-manager@sha256:ff32d9cc6bb9625df547a69b87892f865556a3f3a5421f5fce1dbb57b1b13b66 livenessProbe: failureThreshold: 3 httpGet: diff --git a/test/pullmode-sveltosapplier.yaml b/test/pullmode-sveltosapplier.yaml index 1fda19b7..b001c067 100644 --- a/test/pullmode-sveltosapplier.yaml +++ b/test/pullmode-sveltosapplier.yaml @@ -99,7 +99,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: docker.io/projectsveltos/sveltos-applier@sha256:2fa56ecc207989f12d2801ac5b1fb04aba9855979b4315bb86e02a8d53ba2625 + image: docker.io/projectsveltos/sveltos-applier@sha256:5a65667b59b64ab00bfa1ad8bc95dd1affe3c19b1650b0e2fab703a9449972d4 livenessProbe: failureThreshold: 3 httpGet: