Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CNF-11234: Enable RTE metrics to be scraped securely by Prometheus #1035

Closed
wants to merge 10 commits into from
Closed

CNF-11234: Enable RTE metrics to be scraped securely by Prometheus #1035

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5402651
Enable metrics by default
rbaturov Sep 12, 2024
86a85df
Ensure that NROP metrics are served securely
rbaturov Sep 2, 2024
707c9e0
make generate bundle manifests
rbaturov Sep 15, 2024
eb3a59d
Enabled RTE metrics server by default
rbaturov Oct 1, 2024
dbceda2
Added sidecar to RTE DaemonSet
rbaturov Oct 1, 2024
f9b59c7
Enable pulling sidecar image from operator
rbaturov Oct 1, 2024
1655ed1
Added RTE metrics package and manifests
rbaturov Oct 1, 2024
7f22ac0
Add rule to operator ClusterRole to manage Service resource
rbaturov Sep 29, 2024
e741fe1
RTE metrics enablement
rbaturov Oct 1, 2024
c25a99d
make generate
rbaturov Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions pkg/images/fetch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ import (
)

const (
envVarPodNamespace = "NAMESPACE"
envVarPodName = "PODNAME"
NullPolicy = corev1.PullPolicy("")
NullImage = ""
envVarPodNamespace = "NAMESPACE"
envVarPodName = "PODNAME"
NullPolicy = corev1.PullPolicy("")
NullImage = ""
kubeRbacProxyContainerName = "kube-rbac-proxy"
)

func GetCurrentImage(ctx context.Context) (string, corev1.PullPolicy, error) {
Expand All @@ -46,6 +47,19 @@ func GetCurrentImage(ctx context.Context) (string, corev1.PullPolicy, error) {
return GetImageFromPod(ctx, podNamespace, podName, "")
}

func GetKubeRbacProxyImage(ctx context.Context) (string, error) {
podNamespace, ok := os.LookupEnv(envVarPodNamespace)
if !ok {
return NullImage, fmt.Errorf("environment variable not set: %q", envVarPodNamespace)
}
podName, ok := os.LookupEnv(envVarPodName)
if !ok {
return NullImage, fmt.Errorf("environment variable not set: %q", envVarPodName)
}
img, _, err := GetImageFromPod(ctx, podNamespace, podName, kubeRbacProxyContainerName)
return img, err
}

func GetImageFromPod(ctx context.Context, namespace, podName, containerName string) (string, corev1.PullPolicy, error) {
k8sCli, err := clientutil.NewK8s()
if err != nil {
Expand Down
7 changes: 7 additions & 0 deletions pkg/objectupdate/rte/rte.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,13 @@ func SidecarContainerConfig(ds *appsv1.DaemonSet) {

// Add the sidecar container to the DaemonSet spec
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

redundant comment(s)

ds.Spec.Template.Spec.Containers = append(ds.Spec.Template.Spec.Containers, sidecarContainer)

// Pull kube-rbac-proxy image from operator proxy.
if sidecarImage, err := images.GetKubeRbacProxyImage(context.TODO()); err != nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be a parameter, this code should not access the cluster APIs. We should detect this image once (in main.go and pass it down here.

klog.InfoS("unable to find current image, using hardcoded", "error", err)
} else {
sidecarContainer.Image = sidecarImage
}
}

func AddVolumeMountMemory(podSpec *corev1.PodSpec, cnt *corev1.Container, mountName, dirName string, sizeMiB int64) {
Expand Down