Skip to content

Commit 9c8df05

Browse files
JasonPowrJasonPowr
committedJul 22, 2024·
fix service monitors
·
v1.1.1v1.1.0
1 parent adb850c commit 9c8df05

34 files changed

+190
-141
lines changed
 

‎bundle/manifests/rhtas.redhat.com_rekors.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@ spec:
150150
x-kubernetes-validations:
151151
- message: Feature cannot be disabled
152152
rule: (self || !oldSelf)
153+
host:
154+
description: Set hostname for your Ingress/Route.
155+
type: string
153156
required:
154157
- enabled
155158
type: object

‎bundle/manifests/rhtas.redhat.com_securesigns.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,9 @@ spec:
512512
x-kubernetes-validations:
513513
- message: Feature cannot be disabled
514514
rule: (self || !oldSelf)
515+
host:
516+
description: Set hostname for your Ingress/Route.
517+
type: string
515518
required:
516519
- enabled
517520
type: object

‎internal/clidownload/component.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func (c *Component) Start(ctx context.Context) error {
5858

5959
obj = append(obj, ns)
6060
obj = append(obj, c.createDeployment(ns.Name, labels))
61-
svc := kubernetes.CreateService(ns.Name, cliServerName, cliServerPortName, cliServerPort, labels)
61+
svc := kubernetes.CreateService(ns.Name, cliServerName, cliServerPortName, cliServerPort, cliServerPort, labels)
6262
obj = append(obj, svc)
6363
ingress, err := kubernetes.CreateIngress(ctx, c.Client, *svc, rhtasv1alpha1.ExternalAccess{Host: CliHostName}, cliServerPortName, labels)
6464
if err != nil {

‎internal/controller/common/utils/kubernetes/service.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"k8s.io/apimachinery/pkg/util/intstr"
1313
)
1414

15-
func CreateService(namespace string, name string, portName string, port int, labels map[string]string) *corev1.Service {
15+
func CreateService(namespace string, name string, portName string, port int, targetPort int32, labels map[string]string) *corev1.Service {
1616
return &corev1.Service{
1717
ObjectMeta: metav1.ObjectMeta{
1818
Name: name,
@@ -26,7 +26,7 @@ func CreateService(namespace string, name string, portName string, port int, lab
2626
Name: portName,
2727
Protocol: corev1.ProtocolTCP,
2828
Port: int32(port),
29-
TargetPort: intstr.FromInt(port),
29+
TargetPort: intstr.FromInt32(targetPort),
3030
},
3131
},
3232
},

‎internal/controller/ctlog/actions/constants.go

+6-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ const (
66
RBACName = "ctlog"
77
MonitoringRoleName = "prometheus-k8s-ctlog"
88

9-
CertCondition = "FulcioCertAvailable"
10-
MetricsPortName = "metrics"
11-
MetricsPort = 6963
9+
CertCondition = "FulcioCertAvailable"
10+
ServerPortName = "http"
11+
ServerPort = 80
12+
ServerTargetPort = 6962
13+
MetricsPortName = "metrics"
14+
MetricsPort = 6963
1215
)

‎internal/controller/ctlog/actions/deployment.go

+9-10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package actions
33
import (
44
"context"
55
"fmt"
6+
67
cutils "github.com/securesign/operator/internal/controller/common/utils"
78

89
rhtasv1alpha1 "github.com/securesign/operator/api/v1alpha1"
@@ -39,17 +40,15 @@ func (i deployAction) Handle(ctx context.Context, instance *rhtasv1alpha1.CTlog)
3940

4041
labels := constants.LabelsFor(ComponentName, DeploymentName, instance.Name)
4142

42-
dp, err := utils.CreateDeployment(instance, DeploymentName, RBACName, labels)
43+
dp, err := utils.CreateDeployment(instance, DeploymentName, RBACName, labels, ServerTargetPort, MetricsPort)
4344
if err != nil {
44-
if err != nil {
45-
meta.SetStatusCondition(&instance.Status.Conditions, metav1.Condition{
46-
Type: constants.Ready,
47-
Status: metav1.ConditionFalse,
48-
Reason: constants.Failure,
49-
Message: err.Error(),
50-
})
51-
return i.FailedWithStatusUpdate(ctx, fmt.Errorf("could create server Deployment: %w", err), instance)
52-
}
45+
meta.SetStatusCondition(&instance.Status.Conditions, metav1.Condition{
46+
Type: constants.Ready,
47+
Status: metav1.ConditionFalse,
48+
Reason: constants.Failure,
49+
Message: err.Error(),
50+
})
51+
return i.FailedWithStatusUpdate(ctx, fmt.Errorf("could create server Deployment: %w", err), instance)
5352
}
5453
err = cutils.SetTrustedCA(&dp.Spec.Template, cutils.TrustedCAAnnotationToReference(instance.Annotations))
5554
if err != nil {

‎internal/controller/ctlog/actions/monitoring.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func (i monitoringAction) Handle(ctx context.Context, instance *rhtasv1alpha1.CT
100100
[]monitoringv1.Endpoint{
101101
{
102102
Interval: monitoringv1.Duration("30s"),
103-
Port: ComponentName,
103+
Port: MetricsPortName,
104104
Scheme: "http",
105105
},
106106
},

‎internal/controller/ctlog/actions/service.go

+9-7
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,15 @@ func (i serviceAction) Handle(ctx context.Context, instance *rhtasv1alpha1.CTlog
4040

4141
labels := constants.LabelsFor(ComponentName, ComponentName, instance.Name)
4242

43-
svc := kubernetes.CreateService(instance.Namespace, ComponentName, MetricsPortName, MetricsPort, labels)
44-
svc.Spec.Ports = append(svc.Spec.Ports, corev1.ServicePort{
45-
Name: "80-tcp",
46-
Protocol: corev1.ProtocolTCP,
47-
Port: 80,
48-
TargetPort: intstr.FromInt32(6962),
49-
})
43+
svc := kubernetes.CreateService(instance.Namespace, ComponentName, ServerPortName, ServerPort, ServerTargetPort, labels)
44+
if instance.Spec.Monitoring.Enabled {
45+
svc.Spec.Ports = append(svc.Spec.Ports, corev1.ServicePort{
46+
Name: MetricsPortName,
47+
Protocol: corev1.ProtocolTCP,
48+
Port: MetricsPort,
49+
TargetPort: intstr.FromInt32(MetricsPort),
50+
})
51+
}
5052
if err = controllerutil.SetControllerReference(instance, svc, i.Client.Scheme()); err != nil {
5153
return i.Failed(fmt.Errorf("could not set controller reference for Service: %w", err))
5254
}

‎internal/controller/ctlog/ctlog_controller_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ var _ = Describe("CTlog controller", func() {
123123
}).Should(Equal(constants.Pending))
124124

125125
By("Creating trillian service")
126-
Expect(k8sClient.Create(ctx, kubernetes.CreateService(Namespace, trillian.LogserverDeploymentName, trillian.ServerPortName, trillian.ServerPort, constants.LabelsForComponent(trillian.LogServerComponentName, instance.Name)))).To(Succeed())
126+
Expect(k8sClient.Create(ctx, kubernetes.CreateService(Namespace, trillian.LogserverDeploymentName, trillian.ServerPortName, trillian.ServerPort, trillian.ServerPort, constants.LabelsForComponent(trillian.LogServerComponentName, instance.Name)))).To(Succeed())
127127
Eventually(func(g Gomega) string {
128128
found := &v1alpha1.CTlog{}
129129
g.Expect(k8sClient.Get(ctx, typeNamespaceName, found)).Should(Succeed())
@@ -163,8 +163,7 @@ var _ = Describe("CTlog controller", func() {
163163
Eventually(func() error {
164164
return k8sClient.Get(ctx, types.NamespacedName{Name: actions.ComponentName, Namespace: Namespace}, service)
165165
}).Should(Succeed())
166-
Expect(service.Spec.Ports[0].Port).Should(Equal(int32(6963)))
167-
Expect(service.Spec.Ports[1].Port).Should(Equal(int32(80)))
166+
Expect(service.Spec.Ports[0].Port).Should(Equal(int32(80)))
168167

169168
By("Move to Ready phase")
170169
// Workaround to succeed condition for Ready phase

‎internal/controller/ctlog/ctlog_hot_update_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ var _ = Describe("CTlog update test", func() {
111111
}).Should(Succeed())
112112

113113
By("Creating trillian service")
114-
Expect(k8sClient.Create(ctx, kubernetes.CreateService(Namespace, trillian.LogserverDeploymentName, trillian.ServerPortName, trillian.ServerPort, constants.LabelsForComponent(trillian.LogServerComponentName, instance.Name)))).To(Succeed())
114+
Expect(k8sClient.Create(ctx, kubernetes.CreateService(Namespace, trillian.LogserverDeploymentName, trillian.ServerPortName, trillian.ServerPort, trillian.ServerPort, constants.LabelsForComponent(trillian.LogServerComponentName, instance.Name)))).To(Succeed())
115115

116116
By("Creating fulcio root cert")
117117
fulcioCa := kubernetes.CreateSecret("test", Namespace,

‎internal/controller/ctlog/utils/ctlog_deployment.go

+28-19
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package utils
22

33
import (
44
"errors"
5+
"strconv"
56

67
"github.com/securesign/operator/api/v1alpha1"
78
"github.com/securesign/operator/internal/controller/common/utils"
@@ -12,12 +13,34 @@ import (
1213
"k8s.io/apimachinery/pkg/util/intstr"
1314
)
1415

15-
func CreateDeployment(instance *v1alpha1.CTlog, deploymentName string, sa string, labels map[string]string) (*appsv1.Deployment, error) {
16+
func CreateDeployment(instance *v1alpha1.CTlog, deploymentName string, sa string, labels map[string]string, serverPort, metricsPort int32) (*appsv1.Deployment, error) {
1617
if instance.Status.ServerConfigRef == nil {
1718
return nil, errors.New("server config name not specified")
1819
}
1920
replicas := int32(1)
2021
// Define a new Deployment object
22+
23+
containerPorts := []corev1.ContainerPort{
24+
{
25+
ContainerPort: serverPort,
26+
Protocol: corev1.ProtocolTCP,
27+
},
28+
}
29+
30+
appArgs := []string{
31+
"--http_endpoint=0.0.0.0:" + strconv.Itoa(int(serverPort)),
32+
"--log_config=/ctfe-keys/config",
33+
"--alsologtostderr",
34+
}
35+
36+
if instance.Spec.Monitoring.Enabled {
37+
appArgs = append(appArgs, "--metrics_endpoint=0.0.0.0:"+strconv.Itoa(int(metricsPort)))
38+
containerPorts = append(containerPorts, corev1.ContainerPort{
39+
ContainerPort: metricsPort,
40+
Protocol: corev1.ProtocolTCP,
41+
})
42+
}
43+
2144
dep := &appsv1.Deployment{
2245
ObjectMeta: metav1.ObjectMeta{
2346
Name: deploymentName,
@@ -39,17 +62,12 @@ func CreateDeployment(instance *v1alpha1.CTlog, deploymentName string, sa string
3962
{
4063
Name: "ctlog",
4164
Image: constants.CTLogImage,
42-
Args: []string{
43-
"--http_endpoint=0.0.0.0:6962",
44-
"--metrics_endpoint=0.0.0.0:6963",
45-
"--log_config=/ctfe-keys/config",
46-
"--alsologtostderr",
47-
},
65+
Args: appArgs,
4866
LivenessProbe: &corev1.Probe{
4967
ProbeHandler: corev1.ProbeHandler{
5068
HTTPGet: &corev1.HTTPGetAction{
5169
Path: "/healthz",
52-
Port: intstr.FromInt32(6962),
70+
Port: intstr.FromInt32(serverPort),
5371
},
5472
},
5573
InitialDelaySeconds: 10,
@@ -62,7 +80,7 @@ func CreateDeployment(instance *v1alpha1.CTlog, deploymentName string, sa string
6280
ProbeHandler: corev1.ProbeHandler{
6381
HTTPGet: &corev1.HTTPGetAction{
6482
Path: "/healthz",
65-
Port: intstr.FromInt32(6962),
83+
Port: intstr.FromInt32(serverPort),
6684
},
6785
},
6886
InitialDelaySeconds: 10,
@@ -78,16 +96,7 @@ func CreateDeployment(instance *v1alpha1.CTlog, deploymentName string, sa string
7896
ReadOnly: true,
7997
},
8098
},
81-
Ports: []corev1.ContainerPort{
82-
{
83-
ContainerPort: 6962,
84-
Protocol: corev1.ProtocolTCP,
85-
},
86-
{
87-
ContainerPort: 6963,
88-
Protocol: corev1.ProtocolTCP,
89-
},
90-
},
99+
Ports: containerPorts,
91100
},
92101
},
93102
Volumes: []corev1.Volume{

‎internal/controller/fulcio/actions/constants.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ const (
99

1010
CertCondition = "FulcioCertAvailable"
1111

12-
PortName = "metrics"
13-
Port = 2112
12+
ServerPortName = "http"
13+
ServerPort = 80
14+
TargetServerPort = 5555
15+
GRPCPortName = "grpc"
16+
GRPCPort = 5554
17+
MetricsPortName = "metrics"
18+
MetricsPort = 2112
1419
)

‎internal/controller/fulcio/actions/ingress.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func (i ingressAction) Handle(ctx context.Context, instance *rhtasv1alpha1.Fulci
4343
return i.Failed(fmt.Errorf("could not find service for ingress: %w", err))
4444
}
4545

46-
ingress, err := kubernetes.CreateIngress(ctx, i.Client, *svc, instance.Spec.ExternalAccess, "80-tcp", labels)
46+
ingress, err := kubernetes.CreateIngress(ctx, i.Client, *svc, instance.Spec.ExternalAccess, ServerPortName, labels)
4747
if err != nil {
4848
return i.Failed(fmt.Errorf("could not create ingress object: %w", err))
4949
}

‎internal/controller/fulcio/actions/monitoring.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func (i monitoringAction) Handle(ctx context.Context, instance *rhtasv1alpha1.Fu
100100
[]monitoringv1.Endpoint{
101101
{
102102
Interval: monitoringv1.Duration("30s"),
103-
Port: "fulcio-server",
103+
Port: MetricsPortName,
104104
Scheme: "http",
105105
},
106106
},

‎internal/controller/fulcio/actions/service.go

+14-10
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,23 @@ func (i serviceAction) Handle(ctx context.Context, instance *rhtasv1alpha1.Fulci
4040

4141
labels := constants.LabelsFor(ComponentName, DeploymentName, instance.Name)
4242

43-
svc := kubernetes.CreateService(instance.Namespace, DeploymentName, PortName, Port, labels)
43+
svc := kubernetes.CreateService(instance.Namespace, DeploymentName, ServerPortName, ServerPort, TargetServerPort, labels)
4444
svc.Spec.Ports = append(svc.Spec.Ports, corev1.ServicePort{
45-
Name: "5554-tcp",
45+
Name: GRPCPortName,
4646
Protocol: corev1.ProtocolTCP,
47-
Port: 5554,
48-
TargetPort: intstr.FromInt32(5554),
49-
})
50-
svc.Spec.Ports = append(svc.Spec.Ports, corev1.ServicePort{
51-
Name: "80-tcp",
52-
Protocol: corev1.ProtocolTCP,
53-
Port: 80,
54-
TargetPort: intstr.FromInt32(5555),
47+
Port: GRPCPort,
48+
TargetPort: intstr.FromInt32(GRPCPort),
5549
})
50+
51+
if instance.Spec.Monitoring.Enabled {
52+
svc.Spec.Ports = append(svc.Spec.Ports, corev1.ServicePort{
53+
Name: MetricsPortName,
54+
Protocol: corev1.ProtocolTCP,
55+
Port: MetricsPort,
56+
TargetPort: intstr.FromInt32(MetricsPort),
57+
})
58+
}
59+
5660
if err = controllerutil.SetControllerReference(instance, svc, i.Client.Scheme()); err != nil {
5761
return i.Failed(fmt.Errorf("could not set controller reference for Service: %w", err))
5862
}

‎internal/controller/fulcio/fulcio_controller_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,8 @@ var _ = Describe("Fulcio controller", func() {
209209
Eventually(func() error {
210210
return k8sClient.Get(ctx, types.NamespacedName{Name: actions.DeploymentName, Namespace: Namespace}, service)
211211
}).Should(Succeed())
212-
Expect(service.Spec.Ports[0].Port).Should(Equal(int32(2112)))
212+
Expect(service.Spec.Ports[0].Port).Should(Equal(int32(80)))
213213
Expect(service.Spec.Ports[1].Port).Should(Equal(int32(5554)))
214-
Expect(service.Spec.Ports[2].Port).Should(Equal(int32(80)))
215214

216215
By("Checking if Ingress was successfully created in the reconciliation")
217216
ingress := &v1.Ingress{}
@@ -220,7 +219,7 @@ var _ = Describe("Fulcio controller", func() {
220219
}).Should(Succeed())
221220
Expect(ingress.Spec.Rules[0].Host).Should(Equal("fulcio.localhost"))
222221
Expect(ingress.Spec.Rules[0].IngressRuleValue.HTTP.Paths[0].Backend.Service.Name).Should(Equal(service.Name))
223-
Expect(ingress.Spec.Rules[0].IngressRuleValue.HTTP.Paths[0].Backend.Service.Port.Name).Should(Equal("80-tcp"))
222+
Expect(ingress.Spec.Rules[0].IngressRuleValue.HTTP.Paths[0].Backend.Service.Port.Name).Should(Equal(actions.ServerPortName))
224223

225224
By("Checking if controller will return deployment to desired state")
226225
deployment = &appsv1.Deployment{}

‎internal/controller/fulcio/utils/fulcio_deployment.go

+19-14
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,24 @@ func CreateDeployment(instance *v1alpha1.Fulcio, deploymentName string, sa strin
2929
return nil, errors.New("CA secret is not specified")
3030
}
3131

32+
containerPorts := []corev1.ContainerPort{
33+
{
34+
Protocol: corev1.ProtocolTCP,
35+
ContainerPort: 5555,
36+
},
37+
{
38+
Protocol: corev1.ProtocolTCP,
39+
ContainerPort: 5554,
40+
},
41+
}
42+
43+
if instance.Spec.Monitoring.Enabled {
44+
containerPorts = append(containerPorts, corev1.ContainerPort{
45+
Protocol: corev1.ProtocolTCP,
46+
ContainerPort: 2112,
47+
})
48+
}
49+
3250
args := []string{
3351
"serve",
3452
"--port=5555",
@@ -95,20 +113,7 @@ func CreateDeployment(instance *v1alpha1.Fulcio, deploymentName string, sa strin
95113
Image: constants.FulcioServerImage,
96114
Args: args,
97115
Env: env,
98-
Ports: []corev1.ContainerPort{
99-
{
100-
Protocol: corev1.ProtocolTCP,
101-
ContainerPort: 5555,
102-
},
103-
{
104-
Protocol: corev1.ProtocolTCP,
105-
ContainerPort: 5554,
106-
},
107-
{
108-
Protocol: corev1.ProtocolTCP,
109-
ContainerPort: 2112,
110-
},
111-
},
116+
Ports: containerPorts,
112117
LivenessProbe: &corev1.Probe{
113118
ProbeHandler: corev1.ProbeHandler{
114119
HTTPGet: &corev1.HTTPGetAction{

‎internal/controller/rekor/actions/constants.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ package actions
22

33
const (
44
ServerDeploymentName = "rekor-server"
5-
ServerDeploymentPortName = "metrics"
6-
ServerDeploymentPort = 2112
5+
ServerDeploymentPortName = "http"
6+
ServerDeploymentPort = 80
7+
ServerTargetDeploymentPort = 3000
8+
MetricsPortName = "metrics"
9+
MetricsPort = 2112
710
RedisDeploymentName = "rekor-redis"
811
RedisDeploymentPortName = "resp"
912
RedisDeploymentPort = 6379

0 commit comments

Comments
 (0)
Please sign in to comment.