Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions .github/workflows/build-centraldashboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: component/centraldashboard
on:
push:
branches:
- kubeflow-aaw2.0
- zone
paths:
- components/centraldashboard/**
pull_request:
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
run: echo "REGISTRY=${{env.REGISTRY_NAME}}.azurecr.io" >> "$GITHUB_ENV"

- name: Set ENV variable for pushes to master
if: github.event_name == 'push' && github.ref == 'refs/heads/kubeflow-aaw2.0'
if: github.event_name == 'push' && github.ref == 'refs/heads/zone'
run: echo "REGISTRY=${{env.REGISTRY_NAME}}.azurecr.io" >> "$GITHUB_ENV"

# Connect to Azure Container registry (ACR)
Expand All @@ -72,11 +72,11 @@ jobs:
- name: Docker build
run: |
docker build \
-t localhost:5000/kubeflow/centraldashboard-aaw2:${{ github.sha }} \
-t localhost:5000/kubeflow/centraldashboard-zone:${{ github.sha }} \
--build-arg kubeflowversion=$(git describe --abbrev=0 --tags) \
--build-arg commit=$(git rev-parse HEAD) \
components/centraldashboard/
docker push localhost:5000/kubeflow/centraldashboard-aaw2:${{ github.sha }}
docker push localhost:5000/kubeflow/centraldashboard-zone:${{ github.sha }}
docker image prune

# Scan image for vulnerabilities
Expand All @@ -92,7 +92,7 @@ jobs:
trivy image \
--db-repository ${{ env.TRIVY_DATABASES }} \
--java-db-repository ${{ env.TRIVY_JAVA_DATABASES }} \
image localhost:5000/kubeflow/centraldashboard-aaw2:${{ github.sha }} \
image localhost:5000/kubeflow/centraldashboard-zone:${{ github.sha }} \
--exit-code 10 --timeout=20m --scanners vuln --severity CRITICAL \
EXIT_CODE=$?

Expand Down Expand Up @@ -124,9 +124,9 @@ jobs:
- name: Docker push
if: steps.should-i-push.outputs.boolean == 'true'
run: |
docker pull localhost:5000/kubeflow/centraldashboard-aaw2:${{ github.sha }}
docker tag localhost:5000/kubeflow/centraldashboard-aaw2:${{ github.sha }} ${{ env.REGISTRY }}/kubeflow/centraldashboard-aaw2:${{ github.sha }}
docker push ${{ env.REGISTRY }}/kubeflow/centraldashboard-aaw2:${{ github.sha }}
docker pull localhost:5000/kubeflow/centraldashboard-zone:${{ github.sha }}
docker tag localhost:5000/kubeflow/centraldashboard-zone:${{ github.sha }} ${{ env.REGISTRY }}/kubeflow/centraldashboard-zone:${{ github.sha }}
docker push ${{ env.REGISTRY }}/kubeflow/centraldashboard-zone:${{ github.sha }}

- name: Slack Notification
if: failure() && github.event_name=='schedule'
Expand Down
2 changes: 1 addition & 1 deletion components/centraldashboard/app/k8s_service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export class KubernetesService {
/** Retrieves the configmap data for the list of filers. */
async getFilersListConfigMap(): Promise<k8s.V1ConfigMap> {
try {
const { body } = await this.coreAPI.readNamespacedConfigMap("filers-list", "das");
const { body } = await this.coreAPI.readNamespacedConfigMap("filers-list", "zone");
return body;
} catch (err) {
console.error('Unable to fetch filers list ConfigMap:', err.response?.body || err.body || err);
Expand Down