Fix reconciler config

3scale-ops · Dec 7, 2023 · 874b875 · 874b875
1 parent 89d436a
commit 874b875
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 74 deletions.
diff --git a/controllers/reconciler_config.go b/controllers/reconciler_config.go
@@ -58,17 +58,21 @@ func init() {
 				"spec.template.spec.schedulerName",
 				"spec.template.spec.restartPolicy",
 				"spec.template.spec.securityContext",
-				// "spec.template.spec.terminationGracePeriodSeconds",
 				"spec.template.spec.containers[*].terminationMessagePath",
 				"spec.template.spec.containers[*].terminationMessagePolicy",
+				"spec.template.spec.initContainers[*].terminationMessagePath",
+				"spec.template.spec.initContainers[*].terminationMessagePolicy",
 			},
 		})
 	config.SetDefaultReconcileConfigForGVK(
 		schema.FromAPIVersionAndKind("apps/v1", "StatefulSet"),
 		config.ReconcileConfigForGVK{
 			EnsureProperties: []string{
+				"metadata.annotations",
+				"metadata.labels",
 				"spec.minReadySeconds",
 				"spec.persistentVolumeClaimRetentionPolicy",
+				"spec.podManagementPolicy",
 				"spec.replicas",
 				"spec.selector",
 				"spec.serviceName",
@@ -81,12 +85,13 @@ func init() {
 			IgnoreProperties: []string{
 				"metadata.annotations['deployment.kubernetes.io/revision']",
 				"spec.template.spec.dnsPolicy",
-				"spec.template.spec.schedulerName",
 				"spec.template.spec.restartPolicy",
+				"spec.template.spec.schedulerName",
 				"spec.template.spec.securityContext",
-				// "spec.template.spec.terminationGracePeriodSeconds",
 				"spec.template.spec.containers[*].terminationMessagePath",
 				"spec.template.spec.containers[*].terminationMessagePolicy",
+				"spec.template.spec.initContainers[*].terminationMessagePath",
+				"spec.template.spec.initContainers[*].terminationMessagePolicy",
 			},
 		})
 	config.SetDefaultReconcileConfigForGVK(
@@ -113,18 +118,7 @@ func init() {
 			},
 		})
 	config.SetDefaultReconcileConfigForGVK(
-		schema.FromAPIVersionAndKind("policy/v1", "PodDisruptionBudget"),
-		config.ReconcileConfigForGVK{
-			EnsureProperties: []string{
-				"metadata.annotations",
-				"metadata.labels",
-				"spec.maxUnavailable",
-				"spec.minAvailable",
-				"spec.selector",
-			},
-		})
-	config.SetDefaultReconcileConfigForGVK(
-		schema.FromAPIVersionAndKind("external-secrets.io/v1alpha1", "ExternalSecret"),
+		schema.FromAPIVersionAndKind("external-secrets.io/v1beta1", "ExternalSecret"),
 		config.ReconcileConfigForGVK{
 			EnsureProperties: []string{
 				"metadata.annotations",

diff --git a/go.mod b/go.mod
@@ -42,7 +42,7 @@ require (
 	sigs.k8s.io/yaml v1.3.0
 )
 
-// replace github.com/3scale-ops/basereconciler v0.3.5 => /home/roi/github.com/3scale/basereconciler
+// replace github.com/3scale-ops/basereconciler => /home/roi/github.com/3scale/basereconciler
 
 require (
 	contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect

diff --git a/go.sum b/go.sum
diff --git a/pkg/generators/sentinel/statefulset.go b/pkg/generators/sentinel/statefulset.go
@@ -76,9 +76,7 @@ func (gen *Generator) statefulSet() *appsv1.StatefulSet {
 								SuccessThreshold:    1,
 								TimeoutSeconds:      5,
 							},
-							Resources:                corev1.ResourceRequirements(*gen.Spec.Resources),
-							TerminationMessagePath:   corev1.TerminationMessagePathDefault,
-							TerminationMessagePolicy: corev1.TerminationMessageReadFile,
+							Resources: corev1.ResourceRequirements(*gen.Spec.Resources),
 							VolumeMounts: []corev1.VolumeMount{
 								{Name: gen.GetComponent() + "-config-rw", MountPath: "/redis"},
 							},

diff --git a/pkg/generators/system/app_deployment.go b/pkg/generators/system/app_deployment.go
@@ -34,10 +34,8 @@ func (gen *AppGenerator) deployment() *appsv1.Deployment {
 							Args: []string{
 								"bundle", "exec", "rake", "k8s:deploy",
 							},
-							Env:                      pod.BuildEnvironment(gen.Options),
-							ImagePullPolicy:          *gen.Image.PullPolicy,
-							TerminationMessagePath:   corev1.TerminationMessagePathDefault,
-							TerminationMessagePolicy: corev1.TerminationMessageReadFile,
+							Env:             pod.BuildEnvironment(gen.Options),
+							ImagePullPolicy: *gen.Image.PullPolicy,
 						},
 					},
 					Containers: []corev1.Container{

diff --git a/pkg/resource_builders/twemproxy/util.go b/pkg/resource_builders/twemproxy/util.go
@@ -28,12 +28,10 @@ func TwemproxyContainer(twemproxySpec *saasv1alpha1.TwemproxySpec) corev1.Contai
 			pod.ContainerPortTCP(twemproxy, 22121),
 			pod.ContainerPortTCP("twem-metrics", int32(*twemproxySpec.Options.MetricsPort)),
 		),
-		Resources:                corev1.ResourceRequirements(*twemproxySpec.Resources),
-		ImagePullPolicy:          *twemproxySpec.Image.PullPolicy,
-		LivenessProbe:            pod.ExecProbe(healthCommand, *twemproxySpec.LivenessProbe),
-		ReadinessProbe:           pod.ExecProbe(healthCommand, *twemproxySpec.ReadinessProbe),
-		TerminationMessagePath:   corev1.TerminationMessagePathDefault,
-		TerminationMessagePolicy: corev1.TerminationMessageReadFile,
+		Resources:       corev1.ResourceRequirements(*twemproxySpec.Resources),
+		ImagePullPolicy: *twemproxySpec.Image.PullPolicy,
+		LivenessProbe:   pod.ExecProbe(healthCommand, *twemproxySpec.LivenessProbe),
+		ReadinessProbe:  pod.ExecProbe(healthCommand, *twemproxySpec.ReadinessProbe),
 		Lifecycle: &corev1.Lifecycle{
 			PreStop: &corev1.LifecycleHandler{
 				Exec: &corev1.ExecAction{

diff --git a/pkg/resource_builders/twemproxy/util_test.go b/pkg/resource_builders/twemproxy/util_test.go
@@ -115,8 +115,6 @@ func Test_AddTwemproxySidecar(t *testing.T) {
 								SuccessThreshold:    *pointer.Int32(1),
 								FailureThreshold:    *pointer.Int32(3),
 							},
-							TerminationMessagePath:   corev1.TerminationMessagePathDefault,
-							TerminationMessagePolicy: corev1.TerminationMessageReadFile,
 							Lifecycle: &corev1.Lifecycle{
 								PreStop: &corev1.LifecycleHandler{
 									Exec: &corev1.ExecAction{

diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -1,7 +1,7 @@
 package version
 
 const (
-	version string = "v0.21.0-alpha.5"
+	version string = "v0.21.0-alpha.6"
 )
 
 // Current returns the current marin3r operator version