Change caddy sidecar image (#1066)

* refactor: change crc-caddy-plugin image * fix: use default value of TargetPort * feat: override command * fix format
RedHatInsights · Oct 28, 2024 · efaaafa · efaaafa
1 parent 9f6fb2b
commit efaaafa
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/controllers/cloud.redhat.com/providers/utils/utils.go b/controllers/cloud.redhat.com/providers/utils/utils.go
@@ -21,7 +21,7 @@ import (
 	"github.com/RedHatInsights/rhc-osdk-utils/utils"
 )
 
-var DefaultImageCaddySideCar = "quay.io/cloudservices/crc-caddy-plugin:27d4bb0"
+var DefaultImageCaddySideCar = "quay.io/redhat-services-prod/hcm-eng-prod-tenant/crc-caddy-plugin:e9fdc0a"
 var DefaultImageCaddyGateway = DefaultImageCaddySideCar
 var DefaultImageMBOP = "quay.io/cloudservices/mbop:4fbb291"
 var DefaultImageMocktitlements = "quay.io/cloudservices/mocktitlements:2d55a98"

diff --git a/controllers/cloud.redhat.com/providers/web/resources_caddygateway.go b/controllers/cloud.redhat.com/providers/web/resources_caddygateway.go
@@ -370,7 +370,7 @@ func makeWebGatewayDeployment(o obj.ClowdObject, objMap providers.ObjectMap, _ b
 		SuccessThreshold:    1,
 		FailureThreshold:    3,
 	}
-
+	command := []string{"caddy", "run", "--config", "/etc/caddy/Caddyfile.json"}
 	c := core.Container{
 		Name:           nn.Name,
 		Ports:          ports,
@@ -399,6 +399,7 @@ func makeWebGatewayDeployment(o obj.ClowdObject, objMap providers.ObjectMap, _ b
 				MountPath: "/certs",
 			},
 		},
+		Command: command,
 	}
 
 	dd.Spec.Template.Spec.Volumes = []core.Volume{
@@ -426,10 +427,9 @@ func makeWebGatewayDeployment(o obj.ClowdObject, objMap providers.ObjectMap, _ b
 	dd.Spec.Template.SetLabels(labels)
 
 	servicePorts := []core.ServicePort{{
-		Name:       "gateway",
-		Port:       port,
-		Protocol:   "TCP",
-		TargetPort: intstr.FromInt(int(port)),
+		Name:     "gateway",
+		Port:     port,
+		Protocol: "TCP",
 	}}
 
 	utils.MakeService(svc, nn, labels, servicePorts, o, false)

diff --git a/tests/kuttl/test-ephemeral-gateway/01-assert.yaml b/tests/kuttl/test-ephemeral-gateway/01-assert.yaml
@@ -82,7 +82,7 @@ spec:
       annotations:
         clowder/authsidecar-config: caddy-config-mocktitlements
         clowder/authsidecar-enabled: "true"
-        clowder/authsidecar-image: quay.io/cloudservices/crc-caddy-plugin:27d4bb0 
+        clowder/authsidecar-image: quay.io/redhat-services-prod/hcm-eng-prod-tenant/crc-caddy-plugin:e9fdc0a
         clowder/authsidecar-port: "8090"
     spec:
       containers:

diff --git a/tests/kuttl/test-ephemeral-gateway/03-assert.yaml b/tests/kuttl/test-ephemeral-gateway/03-assert.yaml
@@ -18,7 +18,7 @@ spec:
         clowder/authsidecar-config: caddy-config-puptoo-processor
         clowder/authsidecar-enabled: "true"
         clowder/authsidecar-port: "8000"
-        clowder/authsidecar-image: quay.io/cloudservices/crc-caddy-plugin:27d4bb0 
+        clowder/authsidecar-image: quay.io/redhat-services-prod/hcm-eng-prod-tenant/crc-caddy-plugin:e9fdc0a
     spec:
       serviceAccountName: puptoo-processor
 status:
@@ -36,7 +36,7 @@ spec:
         clowder/authsidecar-config: caddy-config-puptoo-2paths-processor
         clowder/authsidecar-enabled: "true"
         clowder/authsidecar-port: "8000"
-        clowder/authsidecar-image: quay.io/cloudservices/crc-caddy-plugin:27d4bb0 
+        clowder/authsidecar-image: quay.io/redhat-services-prod/hcm-eng-prod-tenant/crc-caddy-plugin:e9fdc0a
     spec:
       serviceAccountName: puptoo-2paths-processor
 status: