Merge pull request #2763 from camilamacedo86/fix-tralling-spaces

🐛 (kustomize/v1 and v2-alpha): fix spaces for comments and ensure additions

Author: k8s-ci-robot

pkg/plugins/common/kustomize/v1/scaffolds/internal/templates/config/manager/controller_manager_config.go

@@ -55,14 +55,14 @@ webhook:
 leaderElection:
   leaderElect: true
   resourceName: {{ hashFNV .Repo }}.{{ .Domain }}
-#   leaderElectionReleaseOnCancel defines if the leader should step down volume 
-#   when the Manager ends. This requires the binary to immediately end when the
-#   Manager is stopped, otherwise, this setting is unsafe. Setting this significantly
-#   speeds up voluntary leader transitions as the new leader don't have to wait
-#   LeaseDuration time first.
-#   In the default scaffold provided, the program ends immediately after 
-#   the manager stops, so would be fine to enable this option. However, 
-#   if you are doing or is intended to do any operation such as perform cleanups 
-#   after the manager stops then its usage might be unsafe.
-#   leaderElectionReleaseOnCancel: true
+# leaderElectionReleaseOnCancel defines if the leader should step down volume
+# when the Manager ends. This requires the binary to immediately end when the
+# Manager is stopped, otherwise, this setting is unsafe. Setting this significantly
+# speeds up voluntary leader transitions as the new leader don't have to wait
+# LeaseDuration time first.
+# In the default scaffold provided, the program ends immediately after
+# the manager stops, so would be fine to enable this option. However,
+# if you are doing or is intended to do any operation such as perform cleanups
+# after the manager stops then its usage might be unsafe.
+# leaderElectionReleaseOnCancel: true
 `

pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/controller_manager_config.go

@@ -55,4 +55,14 @@ webhook:
 leaderElection:
   leaderElect: true
   resourceName: {{ hashFNV .Repo }}.{{ .Domain }}
+# leaderElectionReleaseOnCancel defines if the leader should step down volume
+# when the Manager ends. This requires the binary to immediately end when the
+# Manager is stopped, otherwise, this setting is unsafe. Setting this significantly
+# speeds up voluntary leader transitions as the new leader don't have to wait
+# LeaseDuration time first.
+# In the default scaffold provided, the program ends immediately after
+# the manager stops, so would be fine to enable this option. However,
+# if you are doing or is intended to do any operation such as perform cleanups
+# after the manager stops then its usage might be unsafe.
+# leaderElectionReleaseOnCancel: true
 `

testdata/project-v3-addon/config/manager/controller_manager_config.yaml

@@ -9,13 +9,13 @@ webhook:
 leaderElection:
   leaderElect: true
   resourceName: 52ea9610.testproject.org
-#   leaderElectionReleaseOnCancel defines if the leader should step down volume 
-#   when the Manager ends. This requires the binary to immediately end when the
-#   Manager is stopped, otherwise, this setting is unsafe. Setting this significantly
-#   speeds up voluntary leader transitions as the new leader don't have to wait
-#   LeaseDuration time first.
-#   In the default scaffold provided, the program ends immediately after 
-#   the manager stops, so would be fine to enable this option. However, 
-#   if you are doing or is intended to do any operation such as perform cleanups 
-#   after the manager stops then its usage might be unsafe.
-#   leaderElectionReleaseOnCancel: true
+# leaderElectionReleaseOnCancel defines if the leader should step down volume
+# when the Manager ends. This requires the binary to immediately end when the
+# Manager is stopped, otherwise, this setting is unsafe. Setting this significantly
+# speeds up voluntary leader transitions as the new leader don't have to wait
+# LeaseDuration time first.
+# In the default scaffold provided, the program ends immediately after
+# the manager stops, so would be fine to enable this option. However,
+# if you are doing or is intended to do any operation such as perform cleanups
+# after the manager stops then its usage might be unsafe.
+# leaderElectionReleaseOnCancel: true

testdata/project-v3-config/config/manager/controller_manager_config.yaml

@@ -9,13 +9,13 @@ webhook:
 leaderElection:
   leaderElect: true
   resourceName: 6858fb70.testproject.org
-#   leaderElectionReleaseOnCancel defines if the leader should step down volume 
-#   when the Manager ends. This requires the binary to immediately end when the
-#   Manager is stopped, otherwise, this setting is unsafe. Setting this significantly
-#   speeds up voluntary leader transitions as the new leader don't have to wait
-#   LeaseDuration time first.
-#   In the default scaffold provided, the program ends immediately after 
-#   the manager stops, so would be fine to enable this option. However, 
-#   if you are doing or is intended to do any operation such as perform cleanups 
-#   after the manager stops then its usage might be unsafe.
-#   leaderElectionReleaseOnCancel: true
+# leaderElectionReleaseOnCancel defines if the leader should step down volume
+# when the Manager ends. This requires the binary to immediately end when the
+# Manager is stopped, otherwise, this setting is unsafe. Setting this significantly
+# speeds up voluntary leader transitions as the new leader don't have to wait
+# LeaseDuration time first.
+# In the default scaffold provided, the program ends immediately after
+# the manager stops, so would be fine to enable this option. However,
+# if you are doing or is intended to do any operation such as perform cleanups
+# after the manager stops then its usage might be unsafe.
+# leaderElectionReleaseOnCancel: true

testdata/project-v3-multigroup/config/manager/controller_manager_config.yaml

@@ -9,13 +9,13 @@ webhook:
 leaderElection:
   leaderElect: true
   resourceName: 14be1926.testproject.org
-#   leaderElectionReleaseOnCancel defines if the leader should step down volume 
-#   when the Manager ends. This requires the binary to immediately end when the
-#   Manager is stopped, otherwise, this setting is unsafe. Setting this significantly
-#   speeds up voluntary leader transitions as the new leader don't have to wait
-#   LeaseDuration time first.
-#   In the default scaffold provided, the program ends immediately after 
-#   the manager stops, so would be fine to enable this option. However, 
-#   if you are doing or is intended to do any operation such as perform cleanups 
-#   after the manager stops then its usage might be unsafe.
-#   leaderElectionReleaseOnCancel: true
+# leaderElectionReleaseOnCancel defines if the leader should step down volume
+# when the Manager ends. This requires the binary to immediately end when the
+# Manager is stopped, otherwise, this setting is unsafe. Setting this significantly
+# speeds up voluntary leader transitions as the new leader don't have to wait
+# LeaseDuration time first.
+# In the default scaffold provided, the program ends immediately after
+# the manager stops, so would be fine to enable this option. However,
+# if you are doing or is intended to do any operation such as perform cleanups
+# after the manager stops then its usage might be unsafe.
+# leaderElectionReleaseOnCancel: true

testdata/project-v3-with-kustomize-v2/config/manager/controller_manager_config.yaml

@@ -9,3 +9,13 @@ webhook:
 leaderElection:
   leaderElect: true
   resourceName: f4c39f8b.testproject.org
+# leaderElectionReleaseOnCancel defines if the leader should step down volume
+# when the Manager ends. This requires the binary to immediately end when the
+# Manager is stopped, otherwise, this setting is unsafe. Setting this significantly
+# speeds up voluntary leader transitions as the new leader don't have to wait
+# LeaseDuration time first.
+# In the default scaffold provided, the program ends immediately after
+# the manager stops, so would be fine to enable this option. However,
+# if you are doing or is intended to do any operation such as perform cleanups
+# after the manager stops then its usage might be unsafe.
+# leaderElectionReleaseOnCancel: true

testdata/project-v3/config/manager/controller_manager_config.yaml

@@ -9,13 +9,13 @@ webhook:
 leaderElection:
   leaderElect: true
   resourceName: dd1da13f.testproject.org
-#   leaderElectionReleaseOnCancel defines if the leader should step down volume 
-#   when the Manager ends. This requires the binary to immediately end when the
-#   Manager is stopped, otherwise, this setting is unsafe. Setting this significantly
-#   speeds up voluntary leader transitions as the new leader don't have to wait
-#   LeaseDuration time first.
-#   In the default scaffold provided, the program ends immediately after 
-#   the manager stops, so would be fine to enable this option. However, 
-#   if you are doing or is intended to do any operation such as perform cleanups 
-#   after the manager stops then its usage might be unsafe.
-#   leaderElectionReleaseOnCancel: true
+# leaderElectionReleaseOnCancel defines if the leader should step down volume
+# when the Manager ends. This requires the binary to immediately end when the
+# Manager is stopped, otherwise, this setting is unsafe. Setting this significantly
+# speeds up voluntary leader transitions as the new leader don't have to wait
+# LeaseDuration time first.
+# In the default scaffold provided, the program ends immediately after
+# the manager stops, so would be fine to enable this option. However,
+# if you are doing or is intended to do any operation such as perform cleanups
+# after the manager stops then its usage might be unsafe.
+# leaderElectionReleaseOnCancel: true