Update Makefile for local development; enhance deployment probe handling

Author: sanikachavan5

Makefile

@@ -55,7 +55,7 @@ control-plane-dev-docker: ## Build consul-k8s-control-plane dev Docker image.
        --build-arg 'GIT_COMMIT=$(GIT_COMMIT)' \
        --build-arg 'GIT_DIRTY=$(GIT_DIRTY)' \
        --build-arg 'GIT_DESCRIBE=$(GIT_DESCRIBE)' \
-       -f $(CURDIR)/control-plane/Dockerfile $(CURDIR)/control-plane
+       -f $(CURDIR)/control-plane/Dockerfile $(CURDIR)/control-plane --load
 
 .PHONY: control-plane-dev-skaffold
 # DANGER: this target is experimental and could be modified/removed at any time.

charts/consul/values.yaml

@@ -86,7 +86,7 @@ global:
   # image that is used for functionality such as catalog sync.
   # This can be overridden per component.
   # @default: hashicorp/consul-k8s-control-plane:<latest version>
-  imageK8S: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.10.0-dev
+  imageK8S: consul-k8s-control-plane-dev:local
 
   # The image pull policy used globally for images controlled by Consul (consul, consul-dataplane, consul-k8s, consul-telemetry-collector).
   # One of "IfNotPresent", "Always", "Never", and "". Refer to https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy

control-plane/api-gateway/gatekeeper/deployment.go

@@ -173,18 +173,19 @@ func mergeDeployments(gcc v1alpha1.GatewayClassConfig, a, b *appsv1.Deployment)
 		// Replace template
 		b.Spec.Template = a.Spec.Template
 
-		// Restore probe configurations from existing deployment
+		// Always preserve existing probe configurations (manual edits)
 		for i, container := range b.Spec.Template.Spec.Containers {
 			if existingContainer, exists := existingProbes[i]; exists {
+				// Always preserve existing readiness probe if it exists
 				if existingContainer.ReadinessProbe != nil {
 					container.ReadinessProbe = existingContainer.ReadinessProbe
 				}
-				if existingContainer.LivenessProbe != nil {
-					container.LivenessProbe = existingContainer.LivenessProbe
-				}
+
+				// Always preserve existing startup probe if it exists
 				if existingContainer.StartupProbe != nil {
 					container.StartupProbe = existingContainer.StartupProbe
 				}
+
 				b.Spec.Template.Spec.Containers[i] = container
 			}
 		}
@@ -246,15 +247,6 @@ func compareDeployments(a, b *appsv1.Deployment) bool {
 			return false
 		}
 
-		// Compare liveness probe initialDelaySeconds
-		if container.LivenessProbe != nil && otherContainer.LivenessProbe != nil {
-			if container.LivenessProbe.InitialDelaySeconds != otherContainer.LivenessProbe.InitialDelaySeconds {
-				return false
-			}
-		} else if (container.LivenessProbe == nil) != (otherContainer.LivenessProbe == nil) {
-			return false
-		}
-
 		// Compare startup probe initialDelaySeconds
 		if container.StartupProbe != nil && otherContainer.StartupProbe != nil {
 			if container.StartupProbe.InitialDelaySeconds != otherContainer.StartupProbe.InitialDelaySeconds {