fix conflicts

Author: fghanmi

api/v1alpha1/ctlog_types_test.go

@@ -135,6 +135,7 @@ var _ = Describe("CTlog", func() {
 							Trillian: TrillianService{
 								Address: "trillian-system.default.svc",
 								Port:    &port,
+							},
 							TLSCertificate: TLSCert{
 								CertRef: &SecretKeySelector{
 									Key:                  "cert",

internal/controller/ctlog/actions/constants.go

@@ -6,11 +6,13 @@ const (
 	RBACName           = "ctlog"
 	MonitoringRoleName = "prometheus-k8s-ctlog"
 
-	CertCondition    = "FulcioCertAvailable"
-	ServerPortName   = "http"
-	ServerPort       = 80
-	ServerTargetPort = 6962
-	MetricsPortName  = "metrics"
-	MetricsPort      = 6963
-	ServerCondition  = "ServerAvailable"
+	CertCondition       = "FulcioCertAvailable"
+	ServerPortName      = "http"
+	ServerPort          = 80
+	HttpsServerPortName = "https"
+	HttpsServerPort     = 443
+	ServerTargetPort    = 6962
+	MetricsPortName     = "metrics"
+	MetricsPort         = 6963
+	ServerCondition     = "ServerAvailable"
 )

internal/controller/ctlog/actions/deployment.go

@@ -43,18 +43,14 @@ func (i deployAction) Handle(ctx context.Context, instance *rhtasv1alpha1.CTlog)
 
 	labels := constants.LabelsFor(ComponentName, DeploymentName, instance.Name)
 
-<<<<<<< HEAD
+	signingKeySecret, _ := k8sutils.GetSecret(i.Client, "openshift-service-ca", "signing-key")
+	useHTTPS := (instance.Spec.TLSCertificate.CertRef != nil && instance.Spec.TLSCertificate.CACertRef != nil) || (signingKeySecret != nil)
 	switch {
 	case instance.Spec.Trillian.Address == "":
 		instance.Spec.Trillian.Address = fmt.Sprintf("%s.%s.svc", trillian.LogserverDeploymentName, instance.Namespace)
 	}
 
-	dp, err := utils.CreateDeployment(instance, DeploymentName, RBACName, labels, ServerTargetPort, MetricsPort)
-=======
-	signingKeySecret, _ := k8sutils.GetSecret(i.Client, "openshift-service-ca", "signing-key")
-	useHTTPS := (instance.Spec.TLSCertificate.CertRef != nil && instance.Spec.TLSCertificate.CACertRef != nil) || (signingKeySecret != nil)
-	dp, err := utils.CreateDeployment(instance, DeploymentName, RBACName, labels, useHTTPS)
->>>>>>> df48e12 (updates-1)
+	dp, err := utils.CreateDeployment(instance, DeploymentName, RBACName, labels, ServerTargetPort, MetricsPort, useHTTPS)
 	if err != nil {
 		meta.SetStatusCondition(&instance.Status.Conditions, metav1.Condition{
 			Type:    constants.Ready,

internal/controller/ctlog/actions/service.go

@@ -41,8 +41,17 @@ func (i serviceAction) Handle(ctx context.Context, instance *rhtasv1alpha1.CTlog
 
 	labels := constants.LabelsFor(ComponentName, ComponentName, instance.Name)
 
-<<<<<<< HEAD
-	svc := kubernetes.CreateService(instance.Namespace, ComponentName, ServerPortName, ServerPort, ServerTargetPort, labels)
+	signingKeySecret, _ := k8sutils.GetSecret(i.Client, "openshift-service-ca", "signing-key")
+	var port int
+	var portName string
+	if instance.Spec.TLSCertificate.CertRef != nil || signingKeySecret != nil {
+		port = HttpsServerPort
+		portName = HttpsServerPortName
+	} else {
+		port = ServerPort
+		portName = ServerPortName
+	}
+	svc := kubernetes.CreateService(instance.Namespace, ComponentName, portName, port, ServerTargetPort, labels)
 	if instance.Spec.Monitoring.Enabled {
 		svc.Spec.Ports = append(svc.Spec.Ports, corev1.ServicePort{
 			Name:       MetricsPortName,
@@ -51,23 +60,6 @@ func (i serviceAction) Handle(ctx context.Context, instance *rhtasv1alpha1.CTlog
 			TargetPort: intstr.FromInt32(MetricsPort),
 		})
 	}
-=======
-	signingKeySecret, _ := k8sutils.GetSecret(i.Client, "openshift-service-ca", "signing-key")
-	var port int32
-	if instance.Spec.TLSCertificate.CertRef != nil || signingKeySecret != nil {
-		port = int32(443)
-	} else {
-		port = int32(80)
-	}
-	portName := fmt.Sprintf("%d-tcp", port)
-	svc := kubernetes.CreateService(instance.Namespace, ComponentName, MetricsPortName, MetricsPort, labels)
-	svc.Spec.Ports = append(svc.Spec.Ports, corev1.ServicePort{
-		Name:       portName,
-		Protocol:   corev1.ProtocolTCP,
-		Port:       port,
-		TargetPort: intstr.FromInt32(6962),
-	})
->>>>>>> df48e12 (updates-1)
 	if err = controllerutil.SetControllerReference(instance, svc, i.Client.Scheme()); err != nil {
 		return i.Failed(fmt.Errorf("could not set controller reference for Service: %w", err))
 	}

internal/controller/ctlog/ctlog_controller_test.go

@@ -174,12 +174,7 @@ var _ = Describe("CTlog controller", func() {
 			Eventually(func() error {
 				return k8sClient.Get(ctx, types.NamespacedName{Name: actions.ComponentName, Namespace: Namespace}, service)
 			}).Should(Succeed())
-<<<<<<< HEAD
-			Expect(service.Spec.Ports[0].Port).Should(Equal(int32(80)))
-=======
-			Expect(service.Spec.Ports[0].Port).Should(Equal(int32(6963)))
-			Expect(service.Spec.Ports[1].Port).Should(Equal(int32(443)))
->>>>>>> df48e12 (updates-1)
+			Expect(service.Spec.Ports[0].Port).Should(Equal(int32(443)))
 
 			By("Move to Ready phase")
 			// Workaround to succeed condition for Ready phase

internal/controller/ctlog/utils/ctlog_deployment.go

@@ -13,8 +13,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
-<<<<<<< HEAD
-func CreateDeployment(instance *v1alpha1.CTlog, deploymentName string, sa string, labels map[string]string, serverPort, metricsPort int32) (*appsv1.Deployment, error) {
+func CreateDeployment(instance *v1alpha1.CTlog, deploymentName string, sa string, labels map[string]string, serverPort, metricsPort int32, useHTTPS bool) (*appsv1.Deployment, error) {
 	switch {
 	case instance.Status.ServerConfigRef == nil:
 		return nil, fmt.Errorf("CreateCTLogDeployment: %w", ServerConfigNotSpecified)
@@ -24,11 +23,6 @@ func CreateDeployment(instance *v1alpha1.CTlog, deploymentName string, sa string
 		return nil, fmt.Errorf("CreateCTLogDeployment: %w", TrillianAddressNotSpecified)
 	case instance.Spec.Trillian.Port == nil:
 		return nil, fmt.Errorf("CreateCTLogDeployment: %w", TrillianPortNotSpecified)
-=======
-func CreateDeployment(instance *v1alpha1.CTlog, deploymentName string, sa string, labels map[string]string, useHTTPS bool) (*appsv1.Deployment, error) {
-	if instance.Status.ServerConfigRef == nil {
-		return nil, errors.New("server config name not specified")
->>>>>>> df48e12 (updates-1)
 	}
 	replicas := int32(1)
 	scheme := corev1.URISchemeHTTP
@@ -83,14 +77,9 @@ func CreateDeployment(instance *v1alpha1.CTlog, deploymentName string, sa string
 							LivenessProbe: &corev1.Probe{
 								ProbeHandler: corev1.ProbeHandler{
 									HTTPGet: &corev1.HTTPGetAction{
-<<<<<<< HEAD
-										Path: "/healthz",
-										Port: intstr.FromInt32(serverPort),
-=======
 										Path:   "/healthz",
-										Port:   intstr.FromInt32(6962),
+										Port:   intstr.FromInt32(serverPort),
 										Scheme: scheme,
->>>>>>> df48e12 (updates-1)
 									},
 								},
 								InitialDelaySeconds: 10,
@@ -102,14 +91,9 @@ func CreateDeployment(instance *v1alpha1.CTlog, deploymentName string, sa string
 							ReadinessProbe: &corev1.Probe{
 								ProbeHandler: corev1.ProbeHandler{
 									HTTPGet: &corev1.HTTPGetAction{
-<<<<<<< HEAD
-										Path: "/healthz",
-										Port: intstr.FromInt32(serverPort),
-=======
 										Path:   "/healthz",
-										Port:   intstr.FromInt32(6962),
+										Port:   intstr.FromInt32(serverPort),
 										Scheme: scheme,
->>>>>>> df48e12 (updates-1)
 									},
 								},
 								InitialDelaySeconds: 10,