Skip to content

Add 3 labels to all resources, add e2e test that validate the existence of the three labels #142

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

Draft
Shai1-Levi wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Add 3 labels to all resources, add e2e test that validate the existence of the three labels #142

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9788816
1. Add custom label, propagate the label to all the right files.
Jan 13, 2025
52d10cf
1. Add custom label, propagate the label to all the right files.
Jan 14, 2025
3a3fa91
Fix labels:
Jan 15, 2025
aaf05ab
Fix labels:
Jan 16, 2025
ee4f3bc
Fix labels:
Jan 16, 2025
37e41e9
Fix labels:
Jan 17, 2025
807c5f9
Add 3 custom labels to all resources, add e2e test that validate the …
Jan 21, 2025
1827784
Refactor tests
Jan 22, 2025
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
4 changes: 2 additions & 2 deletions bundle/manifests/node-maintenance-controller-manager-metrics-service_v1_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ kind: Service
metadata:
creationTimestamp: null
labels:
app.kubernetes.io/component: controller-manager
app.kubernetes.io/name: node-maintenance-operator
control-plane: controller-manager
node-maintenance-operator: ""
name: node-maintenance-controller-manager-metrics-service
spec:
Expand All @@ -14,8 +14,8 @@ spec:
protocol: TCP
targetPort: https
selector:
app.kubernetes.io/component: controller-manager
app.kubernetes.io/name: node-maintenance-operator
control-plane: controller-manager
node-maintenance-operator: ""
status:
loadBalancer: {}
11 changes: 6 additions & 5 deletions bundle/manifests/node-maintenance-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ metadata:
]
capabilities: Basic Install
categories: OpenShift Optional
containerImage: ""
createdAt: ""
containerImage: quay.io/rh-ee-slevi/node-maintenance-operator:latest
createdAt: 2025-01-16 19:42:40
description: Node Maintenance Operator for cordoning and draining nodes.
olm.skipRange: '>=0.12.0'
operatorframework.io/suggested-namespace: openshift-workload-availability
Expand Down Expand Up @@ -205,25 +205,26 @@ spec:
serviceAccountName: node-maintenance-controller-manager
deployments:
- label:
app.kubernetes.io/component: controller-manager
app.kubernetes.io/name: node-maintenance-operator
control-plane: controller-manager
node-maintenance-operator: ""
name: node-maintenance-controller-manager
spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/component: controller-manager
app.kubernetes.io/name: node-maintenance-operator
control-plane: controller-manager
node-maintenance-operator: ""
strategy: {}
template:
metadata:
annotations:
kubectl.kubernetes.io/default-container: manager
labels:
app.kubernetes.io/component: controller-manager
app.kubernetes.io/name: node-maintenance-operator
control-plane: controller-manager
kubectl.kubernetes.io/default-container: manager
node-maintenance-operator: ""
spec:
affinity:
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/node-maintenance-webhook-service_v1_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ spec:
protocol: TCP
targetPort: 9443
selector:
app.kubernetes.io/component: controller-manager
app.kubernetes.io/name: node-maintenance-operator
control-plane: controller-manager
node-maintenance-operator: ""
status:
loadBalancer: {}
9 changes: 5 additions & 4 deletions config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Namespace
metadata:
labels:
control-plane: controller-manager
app.kubernetes.io/component: controller-manager
name: system
---
apiVersion: apps/v1
Expand All @@ -11,18 +11,19 @@ metadata:
name: controller-manager
namespace: system
labels:
control-plane: controller-manager
app.kubernetes.io/component: controller-manager
spec:
selector:
matchLabels:
control-plane: controller-manager
app.kubernetes.io/component: controller-manager
replicas: 1
template:
metadata:
annotations:
kubectl.kubernetes.io/default-container: manager
labels:
control-plane: controller-manager
app.kubernetes.io/component: controller-manager
kubectl.kubernetes.io/default-container: manager
spec:
affinity:
nodeAffinity:
Expand Down
4 changes: 2 additions & 2 deletions config/prometheus/monitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
control-plane: controller-manager
app.kubernetes.io/component: controller-manager
name: controller-manager-metrics-monitor
namespace: system
spec:
Expand All @@ -17,4 +17,4 @@ spec:
insecureSkipVerify: true
selector:
matchLabels:
control-plane: controller-manager
app.kubernetes.io/component: controller-manager
4 changes: 2 additions & 2 deletions config/rbac/auth_proxy_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
labels:
control-plane: controller-manager
app.kubernetes.io/component: controller-manager
name: controller-manager-metrics-service
namespace: system
spec:
Expand All @@ -12,4 +12,4 @@ spec:
protocol: TCP
targetPort: https
selector:
control-plane: controller-manager
app.kubernetes.io/component: controller-manager
2 changes: 1 addition & 1 deletion config/webhook/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ spec:
protocol: TCP
targetPort: 9443
selector:
control-plane: controller-manager
app.kubernetes.io/component: controller-manager
2 changes: 1 addition & 1 deletion test/e2e/node_maintenance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ func getOperatorPod() *corev1.Pod {
}

func getOperatorLabel() bool {
pods, err := KubeClient.CoreV1().Pods(operatorNsName).List(context.Background(), metav1.ListOptions{LabelSelector: "app.kubernetes.io/name: node-maintenance-operator"})
pods, err := KubeClient.CoreV1().Pods(operatorNsName).List(context.Background(), metav1.ListOptions{LabelSelector: "app.kubernetes.io/name=node-maintenance-operator"})
Copy link
Member

@razo7 razo7 Jan 19, 2025

Choose a reason for hiding this comment

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

IIUC the PR introduces 3 new labels while this function looks for the existence of only one of them. See also K8s recommended labels .

Copy link
Author

@Shai1-Levi Shai1-Levi Jan 19, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Thanks, I will add the new labels into thse e2e test.
Regard k8s recommended labels I over this doc and I think that all the relevant labels was added. Thank you for introducing me with these k8s convention

ExpectWithOffset(2, err).ToNot(HaveOccurred(), "failed to get operator pods")
ExpectWithOffset(2, len(pods.Items)).ToNot(BeZero(), "no operator pod found")
return true
Expand Down