Skip to content

Commit d0ca1a5

Browse files
Yehudit Keridoyehudit1987
Yehudit Kerido
authored and
yehudit1987
committed
Update images paths from ghcr.io/kubeflow/kubeflow/* to ghcr.io/kubeflow/dashboard/*
Signed-off-by: Yehudit Kerido <[email protected]>
1 parent d4e7704 commit d0ca1a5

File tree

100 files changed

+442
-329
lines changed

Some content is hidden

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

100 files changed

+442
-329
lines changed

‎.github/workflows/central_dashboard_angular_integration_test.yaml‎

Lines changed: 19 additions & 20 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

@@ -48,11 +48,11 @@ jobs:
4848
- name: Create Kubeflow Namespace
4949
run: kubectl create namespace kubeflow
5050

51-
- name: Build KFAM Image
51+
- name: Build Access Management 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: 21 additions & 22 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,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: Build and Deploy Central Dashboard
7272
run: |
7373
./testing/gh-actions/deploy_component.sh \
74-
"centraldashboard" \
7574
"components/centraldashboard" \
7675
"${DASHBOARD_IMG}" \
7776
"${TAG}" \
7877
"manifests" \
7978
"overlays/kserve"
80-
kubectl wait --for=condition=Ready pods -n kubeflow -l app=centraldashboard --timeout=300s
81-
kubectl wait --for=condition=Available deployment -n kubeflow centraldashboard --timeout=300s
79+
kubectl wait --for=condition=Ready pods -n kubeflow -l app=dashboard --timeout=300s
80+
kubectl wait --for=condition=Available deployment -n kubeflow dashboard --timeout=300s
8281
8382
- name: Create Test Profile for Dashboard Testing
8483
run: |
@@ -101,15 +100,15 @@ jobs:
101100
102101
- name: Validate Service
103102
run: |
104-
./testing/gh-actions/test_service.sh validate-service centraldashboard kubeflow
103+
./testing/gh-actions/test_service.sh validate-service dashboard kubeflow
105104
106105
- name: Start Port Forward for Dashboard Testing
107106
run: |
108-
./testing/gh-actions/test_service.sh port-forward centraldashboard kubeflow 8082 80
107+
./testing/gh-actions/test_service.sh port-forward dashboard kubeflow 8082 80
109108
110109
- name: Test Dashboard Health
111110
run: |
112-
./testing/gh-actions/test_service.sh test-health centraldashboard kubeflow 8082
111+
./testing/gh-actions/test_service.sh test-health dashboard kubeflow 8082
113112
114113
- name: Test Dashboard Web Interface
115114
run: |
@@ -124,37 +123,37 @@ jobs:
124123
exit 1
125124
fi
126125
127-
kubectl get service centraldashboard -n kubeflow
128-
kubectl get pods -n kubeflow -l app=centraldashboard
126+
kubectl get service dashboard -n kubeflow
127+
kubectl get pods -n kubeflow -l app=dashboard
129128
130129
- name: Test Dashboard Performance
131130
run: |
132-
./testing/gh-actions/test_service.sh performance-test centraldashboard kubeflow 8082 80 10
131+
./testing/gh-actions/test_service.sh performance-test dashboard kubeflow 8082 80 10
133132
134133
- name: Test Dashboard Metrics
135134
run: |
136-
./testing/gh-actions/test_service.sh test-metrics centraldashboard kubeflow 8082
135+
./testing/gh-actions/test_service.sh test-metrics dashboard kubeflow 8082
137136
138137
- name: Check Dashboard Logs
139138
run: |
140-
./testing/gh-actions/test_service.sh check-logs centraldashboard kubeflow 50
139+
./testing/gh-actions/test_service.sh check-logs dashboard kubeflow 50
141140
142141
- name: Check for Errors in Logs
143142
run: |
144-
./testing/gh-actions/test_service.sh check-errors centraldashboard kubeflow
143+
./testing/gh-actions/test_service.sh check-errors dashboard kubeflow
145144
146145
- name: Test Dashboard Configuration
147146
run: |
148-
kubectl get configmap centraldashboard-config -n kubeflow
149-
kubectl describe configmap centraldashboard-config -n kubeflow
147+
kubectl get configmap dashboard-config -n kubeflow
148+
kubectl describe configmap dashboard-config -n kubeflow
150149
151150
- name: Test Virtual Service (if Istio is configured)
152151
run: |
153-
kubectl get virtualservice centraldashboard -n kubeflow
152+
kubectl get virtualservice dashboard -n kubeflow
154153
155154
- name: Stop Port Forward
156155
run: |
157-
./testing/gh-actions/test_service.sh stop-port-forward centraldashboard kubeflow 8082
156+
./testing/gh-actions/test_service.sh stop-port-forward dashboard kubeflow 8082
158157
159158
- name: Cleanup Test Resources
160159
run: |

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

0 commit comments

Comments
 (0)