Skip to content

Commit 311fad8

Browse files
alokdangrealokdangre
committed
fix(ci): updated the labels correction
Signed-off-by: alokdangre <alokdangre@gmail.com>
1 parent 941eaf6 commit 311fad8

8 files changed

Lines changed: 24 additions & 23 deletions

‎.github/workflows/central_dashboard_angular_frontend_test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
kubectl create namespace kubeflow
9090
kustomize build profile-controller/manifests/kustomize/overlays/kubeflow | kubectl apply -f -
9191
kustomize build https://github.com/kubeflow/kubeflow//components/notebook-controller/config/overlays/kubeflow?ref=master | kubectl apply -f -
92-
kubectl wait pods -n kubeflow -l kustomize.component=profiles --for=condition=Ready --timeout=300s
92+
kubectl wait pods -n kubeflow -l app=profiles --for=condition=Ready --timeout=300s
9393
kubectl wait pods -n kubeflow -l app=notebook-controller --for=condition=Ready --timeout=300s
9494
9595
- name: Apply JWA manifests

‎.github/workflows/central_dashboard_angular_integration_test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
| sed "s|ghcr.io/kubeflow/dashboard/access-management:[a-zA-Z0-9_.-]*|${ACCESS_MANAGEMENT_IMG}:${TAG}|g" \
6666
| kubectl apply -f -
6767
kubectl wait --for=condition=Available deployment -n kubeflow profiles-deployment --timeout=300s
68-
kubectl wait --for=condition=Ready pods -n kubeflow -l kustomize.component=profiles --timeout=300s
68+
kubectl wait --for=condition=Ready pods -n kubeflow -l app=profiles --timeout=300s
6969
7070
- name: Deploy CentralDashboard-Angular Component
7171
run: |

‎.github/workflows/end_to_end_integration_test.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ jobs:
108108
- name: Test KFAM Service Integration
109109
run: |
110110
kubectl get services -n kubeflow | grep kfam
111-
kubectl get services -n kubeflow -l kustomize.component=profiles
111+
kubectl get services -n kubeflow -l app=profiles
112112
113-
POD_NAME=$(kubectl get pods -n kubeflow -l kustomize.component=profiles -o jsonpath="{.items[0].metadata.name}")
113+
POD_NAME=$(kubectl get pods -n kubeflow -l app=profiles -o jsonpath="{.items[0].metadata.name}")
114114
if [ -z "$POD_NAME" ]; then exit 1; fi
115115
116116
kubectl port-forward -n kubeflow pod/$POD_NAME 8081:8081 &
@@ -193,7 +193,7 @@ jobs:
193193
run: |
194194
./testing/shared/test_service.sh check-logs profiles-deployment kubeflow 30
195195
196-
kubectl logs -n kubeflow -l kustomize.component=profiles -c access-management --tail=30 || kubectl logs -n kubeflow -l app=profiles-kfam --tail=30
196+
kubectl logs -n kubeflow -l app=profiles -c access-management --tail=30 || kubectl logs -n kubeflow -l app=profiles-kfam --tail=30
197197
198198
./testing/shared/test_service.sh check-logs poddefaults-webhook-deployment kubeflow 30
199199
@@ -204,7 +204,7 @@ jobs:
204204
- name: Check for Component Errors
205205
run: |
206206
./testing/shared/test_service.sh check-errors profiles-deployment kubeflow
207-
kubectl logs -n kubeflow -l kustomize.component=profiles -c access-management --tail=100 | grep -i error || true
207+
kubectl logs -n kubeflow -l app=profiles -c access-management --tail=100 | grep -i error || true
208208
./testing/shared/test_service.sh check-errors poddefaults-webhook-deployment kubeflow
209209
./testing/shared/test_service.sh check-errors dashboard-angular kubeflow
210210
./testing/shared/test_service.sh check-errors dashboard kubeflow

‎.github/workflows/profiles_kfam_integration_test.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
| sed "s|ghcr.io/kubeflow/dashboard/profile-controller:[a-zA-Z0-9_.-]*|${PROFILE_IMG}:${TAG}|g" \
6363
| sed "s|ghcr.io/kubeflow/dashboard/access-management:[a-zA-Z0-9_.-]*|${ACCESS_MANAGEMENT_IMG}:${TAG}|g" \
6464
| kubectl apply -f -
65-
kubectl wait --for=condition=Ready pods -n kubeflow -l kustomize.component=profiles --timeout=300s
65+
kubectl wait --for=condition=Ready pods -n kubeflow -l app=profiles --timeout=300s
6666
kubectl wait --for=condition=Available deployment -n kubeflow profiles-deployment --timeout=300s
6767
6868
- name: Wait for Profile CRD to be Available
@@ -84,7 +84,7 @@ jobs:
8484
run: |
8585
kubectl get service profiles-kfam -n kubeflow || {
8686
echo "KFAM service not found, KFAM might be deployed as part of profiles deployment"
87-
kubectl wait --for=condition=Ready pods -n kubeflow -l kustomize.component=profiles --timeout=300s
87+
kubectl wait --for=condition=Ready pods -n kubeflow -l app=profiles --timeout=300s
8888
}
8989
9090
- name: Test Profile CRD Installation
@@ -115,9 +115,9 @@ jobs:
115115
- name: Test KFAM Service Health
116116
run: |
117117
kubectl get services -n kubeflow | grep kfam
118-
kubectl get services -n kubeflow -l kustomize.component=profiles
118+
kubectl get services -n kubeflow -l app=profiles
119119
120-
POD_NAME=$(kubectl get pods -n kubeflow -l kustomize.component=profiles -o jsonpath="{.items[0].metadata.name}")
120+
POD_NAME=$(kubectl get pods -n kubeflow -l app=profiles -o jsonpath="{.items[0].metadata.name}")
121121
if [ -z "$POD_NAME" ]; then exit 1; fi
122122
123123
kubectl port-forward -n kubeflow pod/$POD_NAME 8081:8081 &
@@ -134,7 +134,7 @@ jobs:
134134
135135
- name: Test KFAM API with User Context
136136
run: |
137-
POD_NAME=$(kubectl get pods -n kubeflow -l kustomize.component=profiles -o jsonpath="{.items[0].metadata.name}")
137+
POD_NAME=$(kubectl get pods -n kubeflow -l app=profiles -o jsonpath="{.items[0].metadata.name}")
138138
if [ -z "$POD_NAME" ]; then exit 1; fi
139139
140140
kubectl port-forward -n kubeflow pod/$POD_NAME 8081:8081 &
@@ -160,16 +160,16 @@ jobs:
160160
161161
- name: Check KFAM Logs
162162
run: |
163-
kubectl logs -n kubeflow -l kustomize.component=profiles -c access-management --tail=50 || kubectl logs -n kubeflow -l app=kfam --tail=50
163+
kubectl logs -n kubeflow -l app=profiles -c access-management --tail=50 || kubectl logs -n kubeflow -l app=kfam --tail=50
164164
165165
- name: Check Profile Controller Logs
166166
run: |
167-
kubectl logs -n kubeflow -l kustomize.component=profiles --tail=50
167+
kubectl logs -n kubeflow -l app=profiles --tail=50
168168
169169
- name: Check for Errors in Logs
170170
run: |
171-
kubectl logs -n kubeflow -l kustomize.component=profiles -c access-management --tail=100 | grep -i error || echo "No errors found in KFAM logs"
172-
kubectl logs -n kubeflow -l kustomize.component=profiles --tail=100 | grep -i error || echo "No errors found in Profile Controller logs"
171+
kubectl logs -n kubeflow -l app=profiles -c access-management --tail=100 | grep -i error || echo "No errors found in KFAM logs"
172+
kubectl logs -n kubeflow -l app=profiles --tail=100 | grep -i error || echo "No errors found in Profile Controller logs"
173173
174174
- name: Cleanup Test Resources
175175
run: |

‎components/profile-controller/Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,12 @@ $(LOCALBIN):
134134
KUSTOMIZE ?= $(LOCALBIN)/kustomize
135135
CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
136136
ENVTEST ?= $(LOCALBIN)/setup-envtest
137-
ENVTEST_VERSION?=release-0.12
137+
ENVTEST_VERSION?=release-0.17
138138

139139
## Tool Versions
140140
KUSTOMIZE_VERSION ?= v3.2.0
141141
CONTROLLER_TOOLS_VERSION ?= v0.8.0
142+
CONTROLLER_GEN_GOTOOLCHAIN ?= go1.19.13
142143

143144
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
144145
.PHONY: kustomize
@@ -149,7 +150,7 @@ $(KUSTOMIZE): $(LOCALBIN)
149150
.PHONY: controller-gen
150151
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
151152
$(CONTROLLER_GEN): $(LOCALBIN)
152-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
153+
GOBIN=$(LOCALBIN) GOTOOLCHAIN=$(CONTROLLER_GEN_GOTOOLCHAIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
153154

154155
.PHONY: envtest
155156
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.

‎components/profile-controller/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ make deploy
123123

124124
Verify that the controller is running in the `profiles-system` namespace:
125125
```sh
126-
kubectl get pods -l kustomize.component=profiles -n profiles-system
126+
kubectl get pods -l app=profiles -n profiles-system
127127
```
128128

129129
### Clean-up

‎testing/shared/install_profile_controller.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ kustomize build components/profile-controller/manifests/kustomize/overlays/kubef
2727
| kubectl apply -f -
2828

2929
kubectl wait --for=condition=Available deployment -n kubeflow profiles-deployment --timeout=300s
30-
kubectl wait pods -n kubeflow -l kustomize.component=profiles --for=condition=Ready --timeout=300s
30+
kubectl wait pods -n kubeflow -l app=profiles --for=condition=Ready --timeout=300s

‎testing/shared/test_service.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,18 @@ case "$OPERATION" in
8282

8383
"check-logs")
8484
LINES="${6:-50}"
85-
# Handle special case for profiles-deployment which uses kustomize.component=profiles label
85+
# Handle special case for profiles-deployment which uses app=profiles label
8686
if [ "${SERVICE_NAME}" = "profiles-deployment" ]; then
87-
kubectl logs -n "${NAMESPACE}" -l kustomize.component=profiles --tail="${LINES}"
87+
kubectl logs -n "${NAMESPACE}" -l app=profiles --tail="${LINES}"
8888
else
8989
kubectl logs -n "${NAMESPACE}" -l app="${SERVICE_NAME}" --tail="${LINES}"
9090
fi
9191
;;
9292

9393
"check-errors")
94-
# Handle special case for profiles-deployment which uses kustomize.component=profiles label
94+
# Handle special case for profiles-deployment which uses app=profiles label
9595
if [ "${SERVICE_NAME}" = "profiles-deployment" ]; then
96-
kubectl logs -n "${NAMESPACE}" -l kustomize.component=profiles --tail=100 | grep -i error || echo "No errors found"
96+
kubectl logs -n "${NAMESPACE}" -l app=profiles --tail=100 | grep -i error || echo "No errors found"
9797
else
9898
kubectl logs -n "${NAMESPACE}" -l app="${SERVICE_NAME}" --tail=100 | grep -i error || echo "No errors found"
9999
fi

0 commit comments

Comments
 (0)