From 3dd433ffba54e23517d5dd6775d2ad9834c15f23 Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Fri, 13 Dec 2024 09:59:27 +0100 Subject: [PATCH] adding a bit of https port for deployment/service of the IntegrationSink Signed-off-by: Matthias Wessendorf --- .../integration/sink/integrationsink_test.go | 24 ++++++++++++++----- .../sink/resources/container_image.go | 22 +++++++++++++---- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/pkg/reconciler/integration/sink/integrationsink_test.go b/pkg/reconciler/integration/sink/integrationsink_test.go index 8bb0be6f67f..59697487d51 100644 --- a/pkg/reconciler/integration/sink/integrationsink_test.go +++ b/pkg/reconciler/integration/sink/integrationsink_test.go @@ -152,7 +152,6 @@ func TestReconcile(t *testing.T) { serviceLister: listers.GetServiceLister(), secretLister: listers.GetSecretLister(), eventPolicyLister: listers.GetEventPolicyLister(), - systemNamespace: testNS, } return integrationsink.NewReconciler(ctx, logging.FromContext(ctx), fakeeventingclient.Get(ctx), listers.GetIntegrationSinkLister(), controller.GetEventRecorder(ctx), r) @@ -205,11 +204,18 @@ func makeDeployment(sink *sinksv1alpha1.IntegrationSink, ready *corev1.Condition Name: "sink", Image: "gcr.io/knative-nightly/log-sink:latest", ImagePullPolicy: corev1.PullIfNotPresent, - Ports: []corev1.ContainerPort{{ - ContainerPort: 8080, - Protocol: corev1.ProtocolTCP, - Name: "http", - }}, + Ports: []corev1.ContainerPort{ + { + ContainerPort: 8080, + Protocol: corev1.ProtocolTCP, + Name: "http", + }, + { + ContainerPort: 8443, + Protocol: corev1.ProtocolTCP, + Name: "https", + }, + }, Env: []corev1.EnvVar{ { Name: "CAMEL_KAMELET_LOG_SINK_LEVEL", @@ -295,6 +301,12 @@ func makeService(name, namespace string) *corev1.Service { Port: 80, TargetPort: intstr.IntOrString{IntVal: 8080}, }, + { + Name: "https", + Protocol: corev1.ProtocolTCP, + Port: 443, + TargetPort: intstr.IntOrString{IntVal: 8443}, + }, }, Selector: integration.Labels(sinkName), }, diff --git a/pkg/reconciler/integration/sink/resources/container_image.go b/pkg/reconciler/integration/sink/resources/container_image.go index 65091c17596..c1164034b4a 100644 --- a/pkg/reconciler/integration/sink/resources/container_image.go +++ b/pkg/reconciler/integration/sink/resources/container_image.go @@ -63,11 +63,17 @@ func MakeDeploymentSpec(sink *v1alpha1.IntegrationSink) *appsv1.Deployment { Name: "sink", Image: selectImage(sink), ImagePullPolicy: corev1.PullIfNotPresent, - Ports: []corev1.ContainerPort{{ - ContainerPort: 8080, - Protocol: corev1.ProtocolTCP, - Name: "http", - }}, + Ports: []corev1.ContainerPort{ + { + ContainerPort: 8080, + Protocol: corev1.ProtocolTCP, + Name: "http", + }, + { + ContainerPort: 8443, + Protocol: corev1.ProtocolTCP, + Name: "https", + }}, Env: makeEnv(sink), }, }, @@ -102,6 +108,12 @@ func MakeService(sink *v1alpha1.IntegrationSink) *corev1.Service { Port: 80, TargetPort: intstr.IntOrString{IntVal: 8080}, }, + { + Name: "https", + Protocol: corev1.ProtocolTCP, + Port: 443, + TargetPort: intstr.IntOrString{IntVal: 443}, + }, }, }, }