Skip to content

Commit daba2ec

Browse files
Yehudit Keridoyehuditkerido
Yehudit Kerido
authored and
yehuditkerido
committed
Update images paths from ghcr.io/kubeflow/kubeflow/* to ghcr.io/kubeflow/dashboard/*
Signed-off-by: Yehudit Kerido <yehudit.kerido@nokia.com>
1 parent d4e7704 commit daba2ec

75 files changed

Lines changed: 277 additions & 174 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/central_dashboard_angular_integration_test.yaml‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ concurrency:
1616
cancel-in-progress: true
1717

1818
env:
19-
DASHBOARD_IMG: ghcr.io/kubeflow/dashboard/centraldashboard-angular
20-
KFAM_IMG: ghcr.io/kubeflow/dashboard/kfam
19+
DASHBOARD_IMG: ghcr.io/kubeflow/dashboard/dashboard-angular
20+
ACCESS_MANAGEMENT_IMG: ghcr.io/kubeflow/dashboard/access-management
2121
PROFILE_CONTROLLER_IMG: ghcr.io/kubeflow/dashboard/profile-controller
2222
TAG: integration-test
2323

@@ -51,8 +51,8 @@ jobs:
5151
- name: Build KFAM Image
5252
run: |
5353
cd components/access-management
54-
make docker-build-multi-arch IMG="${KFAM_IMG}" TAG="${TAG}"
55-
kind load docker-image "${KFAM_IMG}:${TAG}"
54+
make docker-build-multi-arch IMG="${ACCESS_MANAGEMENT_IMG}" TAG="${TAG}"
55+
kind load docker-image "${ACCESS_MANAGEMENT_IMG}:${TAG}"
5656
cd ../..
5757
5858
- name: Build and Deploy Profile Controller with KFAM
@@ -62,23 +62,22 @@ jobs:
6262
kind load docker-image "${PROFILE_CONTROLLER_IMG}:${TAG}"
6363
cd config
6464
kustomize build overlays/kubeflow \
65-
| sed "s|ghcr.io/kubeflow/kubeflow/profile-controller:[a-zA-Z0-9_.-]*|${PROFILE_CONTROLLER_IMG}:${TAG}|g" \
66-
| sed "s|ghcr.io/kubeflow/kubeflow/kfam:[a-zA-Z0-9_.-]*|${KFAM_IMG}:${TAG}|g" \
65+
| sed "s|ghcr.io/kubeflow/dashboard/profile-controller:[a-zA-Z0-9_.-]*|${PROFILE_CONTROLLER_IMG}:${TAG}|g" \
66+
| sed "s|ghcr.io/kubeflow/dashboard/access-management:[a-zA-Z0-9_.-]*|${ACCESS_MANAGEMENT_IMG}:${TAG}|g" \
6767
| kubectl apply -f -
6868
kubectl wait --for=condition=Available deployment -n kubeflow profiles-deployment --timeout=300s
6969
kubectl wait --for=condition=Ready pods -n kubeflow -l kustomize.component=profiles --timeout=300s
7070
7171
- name: Deploy CentralDashboard-Angular Component
7272
run: |
7373
./testing/gh-actions/deploy_component.sh \
74-
"centraldashboard-angular" \
7574
"components/centraldashboard-angular" \
7675
"${DASHBOARD_IMG}" \
7776
"${TAG}" \
7877
"manifests" \
7978
"overlays/kserve"
80-
kubectl wait --for=condition=Ready pods -n kubeflow -l app=centraldashboard-angular --timeout=300s
81-
kubectl wait --for=condition=Available deployment -n kubeflow centraldashboard-angular --timeout=300s
79+
kubectl wait --for=condition=Ready pods -n kubeflow -l app=dashboard-angular --timeout=300s
80+
kubectl wait --for=condition=Available deployment -n kubeflow dashboard-angular --timeout=300s
8281
8382
- name: Create Test Profile for Dashboard Testing
8483
run: |
@@ -110,15 +109,15 @@ jobs:
110109
111110
- name: Validate Service
112111
run: |
113-
./testing/gh-actions/test_service.sh validate-service centraldashboard-angular kubeflow
112+
./testing/gh-actions/test_service.sh validate-service dashboard-angular kubeflow
114113
115114
- name: Start Port Forward for Dashboard Testing
116115
run: |
117-
./testing/gh-actions/test_service.sh port-forward centraldashboard-angular kubeflow 8080 80
116+
./testing/gh-actions/test_service.sh port-forward dashboard-angular kubeflow 8080 80
118117
119118
- name: Test Dashboard Health
120119
run: |
121-
./testing/gh-actions/test_service.sh test-health centraldashboard-angular kubeflow 8080
120+
./testing/gh-actions/test_service.sh test-health dashboard-angular kubeflow 8080
122121
123122
- name: Test Dashboard Web Interface
124123
run: |
@@ -133,28 +132,28 @@ jobs:
133132
exit 1
134133
fi
135134
136-
kubectl get service centraldashboard-angular -n kubeflow
137-
kubectl get pods -n kubeflow -l app=centraldashboard-angular
135+
kubectl get service dashboard-angular -n kubeflow
136+
kubectl get pods -n kubeflow -l app=dashboard-angular
138137
139138
- name: Test Dashboard Performance
140139
run: |
141-
./testing/gh-actions/test_service.sh performance-test centraldashboard-angular kubeflow 8080 80 8
140+
./testing/gh-actions/test_service.sh performance-test dashboard-angular kubeflow 8080 80 8
142141
143142
- name: Test Dashboard Metrics
144143
run: |
145-
./testing/gh-actions/test_service.sh test-metrics centraldashboard-angular kubeflow 8080
144+
./testing/gh-actions/test_service.sh test-metrics dashboard-angular kubeflow 8080
146145
147146
- name: Check Dashboard Logs
148147
run: |
149-
./testing/gh-actions/test_service.sh check-logs centraldashboard-angular kubeflow 50
148+
./testing/gh-actions/test_service.sh check-logs dashboard-angular kubeflow 50
150149
151150
- name: Check for Errors in Logs
152151
run: |
153-
./testing/gh-actions/test_service.sh check-errors centraldashboard-angular kubeflow
152+
./testing/gh-actions/test_service.sh check-errors dashboard-angular kubeflow
154153
155154
- name: Stop Port Forward
156155
run: |
157-
./testing/gh-actions/test_service.sh stop-port-forward centraldashboard-angular kubeflow 8080
156+
./testing/gh-actions/test_service.sh stop-port-forward dashboard-angular kubeflow 8080
158157
159158
- name: Cleanup Test Resources
160159
run: |

‎.github/workflows/central_dashboard_integration_test.yaml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ concurrency:
1616
cancel-in-progress: true
1717

1818
env:
19-
DASHBOARD_IMG: ghcr.io/kubeflow/dashboard/central-dashboard
20-
KFAM_IMG: ghcr.io/kubeflow/dashboard/kfam
19+
DASHBOARD_IMG: ghcr.io/kubeflow/dashboard/dashboard
20+
ACCESS_MANAGEMENT_IMG: ghcr.io/kubeflow/dashboard/access-management
2121
PROFILE_CONTROLLER_IMG: ghcr.io/kubeflow/dashboard/profile-controller
2222
TAG: integration-test
2323

@@ -51,8 +51,8 @@ jobs:
5151
- name: Build KFAM Image
5252
run: |
5353
cd components/access-management
54-
make docker-build-multi-arch IMG="${KFAM_IMG}" TAG="${TAG}"
55-
kind load docker-image "${KFAM_IMG}:${TAG}"
54+
make docker-build-multi-arch IMG="${ACCESS_MANAGEMENT_IMG}" TAG="${TAG}"
55+
kind load docker-image "${ACCESS_MANAGEMENT_IMG}:${TAG}"
5656
cd ../..
5757
5858
- name: Build and Deploy Profile Controller with KFAM
@@ -62,16 +62,15 @@ jobs:
6262
kind load docker-image "${PROFILE_CONTROLLER_IMG}:${TAG}"
6363
cd config
6464
kustomize build overlays/kubeflow \
65-
| sed "s|ghcr.io/kubeflow/kubeflow/profile-controller:[a-zA-Z0-9_.-]*|${PROFILE_CONTROLLER_IMG}:${TAG}|g" \
66-
| sed "s|ghcr.io/kubeflow/kubeflow/kfam:[a-zA-Z0-9_.-]*|${KFAM_IMG}:${TAG}|g" \
65+
| sed "s|ghcr.io/kubeflow/dashboard/profile-controller:[a-zA-Z0-9_.-]*|${PROFILE_CONTROLLER_IMG}:${TAG}|g" \
66+
| sed "s|ghcr.io/kubeflow/dashboard/access-management:[a-zA-Z0-9_.-]*|${ACCESS_MANAGEMENT_IMG}:${TAG}|g" \
6767
| kubectl apply -f -
6868
kubectl wait --for=condition=Available deployment -n kubeflow profiles-deployment --timeout=300s
6969
kubectl wait --for=condition=Ready pods -n kubeflow -l kustomize.component=profiles --timeout=300s
7070
7171
- name: Build and Deploy Central Dashboard
7272
run: |
7373
./testing/gh-actions/deploy_component.sh \
74-
"centraldashboard" \
7574
"components/centraldashboard" \
7675
"${DASHBOARD_IMG}" \
7776
"${TAG}" \

‎.github/workflows/central_dashboard_multi_arch_test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414
cancel-in-progress: true
1515

1616
env:
17-
IMG: ghcr.io/kubeflow/kubeflow/central-dashboard
17+
IMG: ghcr.io/kubeflow/dashboard/dashboard
1818

1919
jobs:
2020
build:

‎.github/workflows/central_dashboard_oci_publish.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- .github/workflows/central_dashboard_oci_publish.yaml
1111

1212
env:
13-
IMG: ghcr.io/kubeflow/kubeflow/central-dashboard
13+
IMG: ghcr.io/kubeflow/dashboard/dashboard
1414
ARCH: linux/amd64,linux/ppc64le,linux/arm64/v8
1515

1616
jobs:

‎.github/workflows/centraldb_angular_docker_publish.yaml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Build & Publish dashboard-Angular Docker image
2+
on:
3+
push:
4+
branches:
5+
- main
6+
- v*-branch
7+
paths:
8+
- components/dashboard-angular/**
9+
- releasing/version/VERSION
10+
11+
env:
12+
IMG: ghcr.io/kubeflow/dashboard/dashboard-angular
13+
14+
jobs:
15+
push_to_registry:
16+
name: Build & Push image to GHCR
17+
runs-on: ubuntu-22.04
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v4
21+
with:
22+
fetch-depth: 0
23+
24+
- uses: dorny/paths-filter@v3
25+
id: filter
26+
with:
27+
base: ${{ github.ref }}
28+
filters: |
29+
version:
30+
- 'releasing/version/VERSION'
31+
32+
- name: Login to GHCR
33+
uses: docker/login-action@v3
34+
with:
35+
registry: ghcr.io
36+
username: ${{ github.actor }}
37+
password: ${{ secrets.GITHUB_TOKEN }}
38+
39+
- name: Run dashboard-Angular build/push
40+
run: |
41+
cd components/dashboard-angular
42+
make docker-build docker-push
43+
44+
- name: Run dashboard-Angular build/push latest
45+
if: github.ref == 'refs/heads/main'
46+
run: |
47+
export TAG=latest
48+
cd components/dashboard-angular
49+
make docker-build docker-push
50+
51+
- name: Run dashboard-Angular build/push on Version change
52+
id: version
53+
if: steps.filter.outputs.version == 'true'
54+
run: |
55+
export TAG=$(cat releasing/version/VERSION)
56+
cd components/dashboard-angular
57+
make docker-build docker-push

‎.github/workflows/end_to_end_integration_test.yaml‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ concurrency:
1818
cancel-in-progress: true
1919

2020
env:
21-
CENTRALDASHBOARD_IMG: ghcr.io/kubeflow/dashboard/centraldashboard
22-
CENTRALDASHBOARD_ANGULAR_IMG: ghcr.io/kubeflow/dashboard/centraldashboard-angular
21+
CENTRALDASHBOARD_IMG: ghcr.io/kubeflow/dashboard/dashboard
22+
CENTRALDASHBOARD_ANGULAR_IMG: ghcr.io/kubeflow/dashboard/dashboard-angular
2323
PROFILE_CONTROLLER_IMG: ghcr.io/kubeflow/dashboard/profile-controller
24-
KFAM_IMG: ghcr.io/kubeflow/dashboard/kfam
24+
ACCESS_MANAGEMENT_IMG: ghcr.io/kubeflow/dashboard/access-management
2525
ADMISSION_WEBHOOK_IMG: ghcr.io/kubeflow/dashboard/poddefaults-webhook
2626
TAG: e2e-test
2727

@@ -56,8 +56,8 @@ jobs:
5656
- name: Build KFAM Image
5757
run: |
5858
cd components/access-management
59-
make docker-build-multi-arch IMG="${KFAM_IMG}" TAG="${TAG}"
60-
kind load docker-image "${KFAM_IMG}:${TAG}"
59+
make docker-build-multi-arch IMG="${ACCESS_MANAGEMENT_IMG}" TAG="${TAG}"
60+
kind load docker-image "${ACCESS_MANAGEMENT_IMG}:${TAG}"
6161
cd ../..
6262
6363
- name: Deploy Profile Controller with KFAM
@@ -67,8 +67,8 @@ jobs:
6767
kind load docker-image "${PROFILE_CONTROLLER_IMG}:${TAG}"
6868
cd config
6969
kustomize build overlays/kubeflow \
70-
| sed "s|ghcr.io/kubeflow/kubeflow/profile-controller:[a-zA-Z0-9_.-]*|${PROFILE_CONTROLLER_IMG}:${TAG}|g" \
71-
| sed "s|ghcr.io/kubeflow/kubeflow/kfam:[a-zA-Z0-9_.-]*|${KFAM_IMG}:${TAG}|g" \
70+
| sed "s|ghcr.io/kubeflow/dashboard/profile-controller:[a-zA-Z0-9_.-]*|${PROFILE_CONTROLLER_IMG}:${TAG}|g" \
71+
| sed "s|ghcr.io/kubeflow/dashboard/access-management:[a-zA-Z0-9_.-]*|${ACCESS_MANAGEMENT_IMG}:${TAG}|g" \
7272
| kubectl apply -f -
7373
kubectl wait --for=condition=Ready pods -n kubeflow -l kustomize.component=profiles --timeout=300s
7474
kubectl wait --for=condition=Available deployment -n kubeflow profiles-deployment --timeout=300s
@@ -100,16 +100,15 @@ jobs:
100100
- name: Deploy Admission Webhook Component
101101
run: |
102102
./testing/gh-actions/deploy_component.sh \
103-
"admission-webhook" \
104-
"components/admission-webhook" \
103+
"components/poddefaults-webhooks" \
105104
"${ADMISSION_WEBHOOK_IMG}" \
106105
"${TAG}" \
107106
"manifests" \
108107
"overlays/cert-manager"
109108
110109
- name: Wait for Admission Webhook to be Ready
111110
run: |
112-
kubectl wait --for=condition=Available deployment -n kubeflow admission-webhook-deployment --timeout=300s
111+
kubectl wait --for=condition=Available deployment -n kubeflow poddefaults-webhook-deployment --timeout=300s
113112
114113
- name: Deploy CentralDashboard Angular Component
115114
run: |
@@ -118,7 +117,6 @@ jobs:
118117
export CD_CLUSTER_DOMAIN=cluster.local
119118
120119
./testing/gh-actions/deploy_component.sh \
121-
"centraldashboard-angular" \
122120
"components/centraldashboard-angular" \
123121
"${CENTRALDASHBOARD_ANGULAR_IMG}" \
124122
"${TAG}" \
@@ -127,7 +125,7 @@ jobs:
127125
128126
- name: Wait for CentralDashboard Angular to be Ready
129127
run: |
130-
kubectl wait --for=condition=Available deployment -n kubeflow centraldashboard-angular --timeout=300s
128+
kubectl wait --for=condition=Available deployment -n kubeflow dashboard-angular --timeout=300s
131129
132130
- name: Deploy CentralDashboard Component
133131
run: |
@@ -137,7 +135,6 @@ jobs:
137135
export CD_CLUSTER_DOMAIN_PLACEHOLDER=cluster.local
138136
139137
./testing/gh-actions/deploy_component.sh \
140-
"centraldashboard" \
141138
"components/centraldashboard" \
142139
"${CENTRALDASHBOARD_IMG}" \
143140
"${TAG}" \
@@ -191,7 +188,7 @@ jobs:
191188
192189
- name: Test CentralDashboard Angular Integration
193190
run: |
194-
POD_NAME=$(kubectl get pods -n kubeflow -l app=centraldashboard-angular -o jsonpath="{.items[0].metadata.name}")
191+
POD_NAME=$(kubectl get pods -n kubeflow -l app=dashboard-angular -o jsonpath="{.items[0].metadata.name}")
195192
if [ -z "$POD_NAME" ]; then exit 1; fi
196193
197194
kubectl port-forward -n kubeflow pod/$POD_NAME 8082:8082 &
@@ -252,18 +249,18 @@ jobs:
252249
253250
kubectl logs -n kubeflow -l kustomize.component=profiles -c kfam --tail=30 || kubectl logs -n kubeflow -l app=kfam --tail=30
254251
255-
./testing/gh-actions/test_service.sh check-logs admission-webhook-deployment kubeflow 30
252+
./testing/gh-actions/test_service.sh check-logs poddefaults-webhook-deployment kubeflow 30
256253
257-
./testing/gh-actions/test_service.sh check-logs centraldashboard-angular kubeflow 30
254+
./testing/gh-actions/test_service.sh check-logs dashboard-angular kubeflow 30
258255
259256
./testing/gh-actions/test_service.sh check-logs centraldashboard kubeflow 30
260257
261258
- name: Check for Component Errors
262259
run: |
263260
./testing/gh-actions/test_service.sh check-errors profiles-deployment kubeflow
264261
kubectl logs -n kubeflow -l kustomize.component=profiles -c kfam --tail=100 | grep -i error || true
265-
./testing/gh-actions/test_service.sh check-errors admission-webhook-deployment kubeflow
266-
./testing/gh-actions/test_service.sh check-errors centraldashboard-angular kubeflow
262+
./testing/gh-actions/test_service.sh check-errors poddefaults-webhook-deployment kubeflow
263+
./testing/gh-actions/test_service.sh check-errors dashboard-angular kubeflow
267264
./testing/gh-actions/test_service.sh check-errors centraldashboard kubeflow
268265
269266
- name: Final Integration Validation

‎.github/workflows/kfam_multi_arch_test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414
cancel-in-progress: true
1515

1616
env:
17-
IMG: ghcr.io/kubeflow/kubeflow/kfam
17+
IMG: ghcr.io/kubeflow/dashboard/access-management
1818

1919
jobs:
2020
build:

‎.github/workflows/kfam_oci_publish.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- releasing/version/VERSION
1010

1111
env:
12-
IMG: ghcr.io/kubeflow/kubeflow/kfam
12+
IMG: ghcr.io/kubeflow/dashboard/access-management
1313
ARCH: linux/amd64,linux/ppc64le,linux/arm64/v8
1414

1515
jobs:

‎.github/workflows/poddefaults_intergration_test.yaml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: PodDefaults Integration Test
22
on:
33
pull_request:
44
paths:
5-
- components/admission-webhook/**
5+
- components/poddefaults-webhooks/**
66
- releasing/version/VERSION
77
- .github/workflows/poddefaults_intergration_test.yaml
88
branches:
@@ -14,7 +14,7 @@ concurrency:
1414
cancel-in-progress: true
1515

1616
env:
17-
IMG: ghcr.io/kubeflow/kubeflow/poddefaults-webhook
17+
IMG: ghcr.io/kubeflow/dashboard/poddefaults-webhook
1818
TAG: integration-test
1919

2020
jobs:
@@ -50,8 +50,7 @@ jobs:
5050
- name: Deploy PodDefaults Webhook Component
5151
run: |
5252
./testing/gh-actions/deploy_component.sh \
53-
"admission-webhook" \
54-
"components/admission-webhook" \
53+
"components/poddefaults-webhooks" \
5554
"${IMG}" \
5655
"${TAG}" \
5756
"manifests" \
@@ -60,7 +59,7 @@ jobs:
6059
- name: Wait for Admission Webhook to be Ready
6160
run: |
6261
kubectl wait --for=condition=Ready pods -n kubeflow -l app=poddefaults --timeout=300s
63-
kubectl wait --for=condition=Available deployment -n kubeflow admission-webhook-deployment --timeout=300s
62+
kubectl wait --for=condition=Available deployment -n kubeflow poddefaults-webhook-deployment --timeout=300s
6463
6564
- name: Validate Webhook Configuration
6665
run: |

0 commit comments

Comments
 (0)