🐛 : leader-elect arg scaffolded should be scaffolded when component c…

…onfig option is not used (#3013) * updated templates for component config * updates * update * update revert main.go * update revert main.go * revert changes and go thru docs once
kubernetes-sigs · Jun 11, 2023 · 8999ca2 · 8999ca2
1 parent d4e9d81
commit 8999ca2
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 6 deletions.
diff --git a/pkg/plugins/common/kustomize/v1/scaffolds/internal/templates/config/manager/config.go b/pkg/plugins/common/kustomize/v1/scaffolds/internal/templates/config/manager/config.go
@@ -115,7 +115,7 @@ spec:
       containers:
       - command:
         - /manager
-{{- if .ComponentConfig }}
+{{- if not .ComponentConfig }}
         args:
         - --leader-elect
 {{- end }}

diff --git a/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/manager/config.go b/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/manager/config.go
@@ -115,7 +115,7 @@ spec:
       containers:
       - command:
         - /manager
-{{- if .ComponentConfig }}
+{{- if not .ComponentConfig }}
         args:
         - --leader-elect
 {{- end }}

diff --git a/testdata/project-v3-addon-and-grafana/config/manager/manager.yaml b/testdata/project-v3-addon-and-grafana/config/manager/manager.yaml
@@ -68,6 +68,8 @@ spec:
       containers:
       - command:
         - /manager
+        args:
+        - --leader-elect
         image: controller:latest
         name: manager
         securityContext:

diff --git a/testdata/project-v3-config/config/manager/manager.yaml b/testdata/project-v3-config/config/manager/manager.yaml
@@ -68,8 +68,6 @@ spec:
       containers:
       - command:
         - /manager
-        args:
-        - --leader-elect
         image: controller:latest
         name: manager
         securityContext:

diff --git a/testdata/project-v3-multigroup/config/manager/manager.yaml b/testdata/project-v3-multigroup/config/manager/manager.yaml
@@ -68,6 +68,8 @@ spec:
       containers:
       - command:
         - /manager
+        args:
+        - --leader-elect
         image: controller:latest
         name: manager
         securityContext:

diff --git a/testdata/project-v3-with-deploy-image/config/manager/manager.yaml b/testdata/project-v3-with-deploy-image/config/manager/manager.yaml
@@ -68,6 +68,8 @@ spec:
       containers:
       - command:
         - /manager
+        args:
+        - --leader-elect
         image: controller:latest
         name: manager
         env:

diff --git a/testdata/project-v3/config/manager/manager.yaml b/testdata/project-v3/config/manager/manager.yaml
@@ -68,6 +68,8 @@ spec:
       containers:
       - command:
         - /manager
+        args:
+        - --leader-elect
         image: controller:latest
         name: manager
         securityContext:

diff --git a/testdata/project-v4-addon-and-grafana/config/manager/manager.yaml b/testdata/project-v4-addon-and-grafana/config/manager/manager.yaml
@@ -68,6 +68,8 @@ spec:
       containers:
       - command:
         - /manager
+        args:
+        - --leader-elect
         image: controller:latest
         name: manager
         securityContext:

diff --git a/testdata/project-v4-config/config/manager/manager.yaml b/testdata/project-v4-config/config/manager/manager.yaml
@@ -68,8 +68,6 @@ spec:
       containers:
       - command:
         - /manager
-        args:
-        - --leader-elect
         image: controller:latest
         name: manager
         securityContext:

diff --git a/testdata/project-v4-multigroup/config/manager/manager.yaml b/testdata/project-v4-multigroup/config/manager/manager.yaml
@@ -68,6 +68,8 @@ spec:
       containers:
       - command:
         - /manager
+        args:
+        - --leader-elect
         image: controller:latest
         name: manager
         securityContext:

diff --git a/testdata/project-v4-with-deploy-image/config/manager/manager.yaml b/testdata/project-v4-with-deploy-image/config/manager/manager.yaml
@@ -68,6 +68,8 @@ spec:
       containers:
       - command:
         - /manager
+        args:
+        - --leader-elect
         image: controller:latest
         name: manager
         env:

diff --git a/testdata/project-v4/config/manager/manager.yaml b/testdata/project-v4/config/manager/manager.yaml
@@ -68,6 +68,8 @@ spec:
       containers:
       - command:
         - /manager
+        args:
+        - --leader-elect
         image: controller:latest
         name: manager
         securityContext: