Merge branch 'kubearmor:main' into non-k8s-hsp-test

navin772 · Jul 27, 2024 · 7144c35 · 7144c35
2 parents 7a8afd1 + 8129fe0
commit 7144c35
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/pkg/KubeArmorOperator/go.mod b/pkg/KubeArmorOperator/go.mod
@@ -13,7 +13,7 @@ replace (
 require (
 	github.com/kubearmor/KubeArmor/KubeArmor v0.0.0-20240110164432-c2c1b121cd94
 	github.com/kubearmor/KubeArmor/deployments v0.0.0-20230809083125-e2d5d5709d2c
-	github.com/kubearmor/KubeArmor/pkg/KubeArmorController v0.0.0-20240110164432-c2c1b121cd94
+	github.com/kubearmor/KubeArmor/pkg/KubeArmorController v0.0.0-20240709192358-fc2173d2587c
 	github.com/spf13/cobra v1.8.0
 	go.uber.org/zap v1.26.0
 	k8s.io/api v0.29.0

diff --git a/pkg/KubeArmorOperator/internal/controller/resources.go b/pkg/KubeArmorOperator/internal/controller/resources.go
@@ -442,7 +442,6 @@ func (clusterWatcher *ClusterWatcher) deployControllerDeployment(deployment *app
 		deployment.Spec.Template.Spec.NodeSelector = map[string]string{
 			common.SecurityFsLabel: "yes",
 		}
-		deployment.Spec.Template.Spec.Containers = deployments.GetKubeArmorControllerDeployment(common.Namespace).Spec.Template.Spec.Containers
 	} else {
 		deployment.Spec.Template.Spec.NodeSelector = nil
 		for i, container := range deployment.Spec.Template.Spec.Containers {

diff --git a/pkg/KubeArmorOperator/kustomize b/pkg/KubeArmorOperator/kustomize