release: Use DockerHub for all images (#6548)

* release: Update the tag to v1.6.0-alpha and reubild images The GH Actions will pick up the change in releasing/version/VERSION and rebuild all the images. Signed-off-by: Kimonas Sotirchos <kimwnasptd@arrikto.com> * Update all images to use DockerHub Signed-off-by: Kimonas Sotirchos <kimwnasptd@arrikto.com> * notebooks: Reuse ECR images as base We'll need to have proper makefiles for building these images and not expect the base images to be already committed. Signed-off-by: Kimonas Sotirchos <kimwnasptd@arrikto.com> * releasing: Update releasing script for dockerhub Signed-off-by: Kimonas Sotirchos <kimwnasptd@arrikto.com> * release: Update manifests for v1.6.0-rc.0 Signed-off-by: Kimonas Sotirchos <kimwnasptd@arrikto.com>
kubeflow · Jun 30, 2022 · a7529aa · a7529aa
1 parent ad21487
commit a7529aa
Show file tree

Hide file tree

Showing 31 changed files with 75 additions and 92 deletions.
diff --git a/components/admission-webhook/manifests/base/deployment.yaml b/components/admission-webhook/manifests/base/deployment.yaml
@@ -9,7 +9,7 @@ spec:
         sidecar.istio.io/inject: "false"
     spec:
       containers:
-      - image: public.ecr.aws/j1r0q0g6/notebooks/admission-webhook
+      - image: docker.io/kubeflownotebookswg/poddefaults-webhook
         name: admission-webhook
         volumeMounts:
         - mountPath: /etc/webhook/certs

diff --git a/components/admission-webhook/manifests/base/kustomization.yaml b/components/admission-webhook/manifests/base/kustomization.yaml
@@ -14,9 +14,8 @@ commonLabels:
   app.kubernetes.io/component: poddefaults
   app.kubernetes.io/name: poddefaults
 images:
-- name: public.ecr.aws/j1r0q0g6/notebooks/admission-webhook
-  newName: public.ecr.aws/j1r0q0g6/notebooks/admission-webhook
-  newTag: v1.5.0
+- name: docker.io/kubeflownotebookswg/poddefaults-webhook
+  newTag: v1.6.0-rc.0
 namespace: kubeflow
 generatorOptions:
   disableNameSuffixHash: true

diff --git a/components/centraldashboard/manifests/base/deployment.yaml b/components/centraldashboard/manifests/base/deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: centraldashboard
-        image: public.ecr.aws/j1r0q0g6/notebooks/central-dashboard
+        image: docker.io/kubeflownotebookswg/centraldashboard
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:

diff --git a/components/centraldashboard/manifests/base/kustomization.yaml b/components/centraldashboard/manifests/base/kustomization.yaml
@@ -16,9 +16,8 @@ commonLabels:
   app.kubernetes.io/component: centraldashboard
   app.kubernetes.io/name: centraldashboard
 images:
-- name: public.ecr.aws/j1r0q0g6/notebooks/central-dashboard
-  newName: public.ecr.aws/j1r0q0g6/notebooks/central-dashboard
-  newTag: v1.5.0
+- name: docker.io/kubeflownotebookswg/centraldashboard
+  newTag: v1.6.0-rc.0
 configMapGenerator:
 - envs:
   - params.env

diff --git a/components/crud-web-apps/jupyter/Makefile b/components/crud-web-apps/jupyter/Makefile
@@ -1,5 +1,5 @@
 GIT_TAG ?= $(shell git describe --tags --always)
-IMG ?= public.ecr.aws/j1r0q0g6/notebooks/jupyter-web-app
+IMG ?= docker.io/kubeflownotebookswg/jupyter-web-app
 DOCKERFILE ?= jupyter/Dockerfile
 
 docker-build:

diff --git a/components/crud-web-apps/jupyter/backend/apps/common/yaml/spawner_ui_config.yaml b/components/crud-web-apps/jupyter/backend/apps/common/yaml/spawner_ui_config.yaml
@@ -17,23 +17,23 @@
 spawnerFormDefaults:
   image:
     # The container Image for the user's Jupyter Notebook
-    value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-scipy:master-6e4ad3b4
+    value: docker.io/kubeflownotebookswg/notebook-servers/jupyter-scipy:master-6e4ad3b4
     # The list of available standard container Images
     options:
-      - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-scipy:master-6e4ad3b4
-      - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-pytorch-full:master-6e4ad3b4
-      - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-pytorch-cuda-full:master-6e4ad3b4
-      - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-tensorflow-full:master-6e4ad3b4
-      - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-tensorflow-cuda-full:master-6e4ad3b4
+      - docker.io/kubeflownotebookswg/notebook-servers/jupyter-scipy:master-6e4ad3b4
+      - docker.io/kubeflownotebookswg/notebook-servers/jupyter-pytorch-full:master-6e4ad3b4
+      - docker.io/kubeflownotebookswg/notebook-servers/jupyter-pytorch-cuda-full:master-6e4ad3b4
+      - docker.io/kubeflownotebookswg/notebook-servers/jupyter-tensorflow-full:master-6e4ad3b4
+      - docker.io/kubeflownotebookswg/notebook-servers/jupyter-tensorflow-cuda-full:master-6e4ad3b4
   imageGroupOne:
     # The container Image for the user's Group One Server
     # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /`
     # is applied to notebook in this group, configuring
     # the Istio rewrite for containers that host their web UI at `/`
-    value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/codeserver-python:master-e9324d39
+    value: docker.io/kubeflownotebookswg/notebook-servers/codeserver-python:master-e9324d39
     # The list of available standard container Images
     options:
-      - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/codeserver-python:master-e9324d39
+      - docker.io/kubeflownotebookswg/notebook-servers/codeserver-python:master-e9324d39
   imageGroupTwo:
     # The container Image for the user's Group Two Server
     # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /`
@@ -42,10 +42,10 @@ spawnerFormDefaults:
     # The annotation `notebooks.kubeflow.org/http-headers-request-set`
     # is applied to notebook in this group, configuring Istio
     # to add the `X-RStudio-Root-Path` header to requests
-    value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/rstudio-tidyverse:master-e9324d39
+    value: docker.io/kubeflownotebookswg/notebook-servers/rstudio-tidyverse:master-e9324d39
     # The list of available standard container Images
     options:
-      - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/rstudio-tidyverse:master-e9324d39
+      - docker.io/kubeflownotebookswg/notebook-servers/rstudio-tidyverse:master-e9324d39
   # If true, hide registry and/or tag name in the image selection dropdown
   hideRegistry: true
   hideTag: false

diff --git a/components/crud-web-apps/jupyter/frontend/cypress/fixtures/notebook.ts b/components/crud-web-apps/jupyter/frontend/cypress/fixtures/notebook.ts
@@ -2,7 +2,7 @@ export const notebook = {
   name: 'test-notebook',
   namespace: 'default',
   image:
-    'public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-scipy:master-1831e436',
+    'docker.io/kubeflownotebookswg/notebook-servers/jupyter-scipy:master-1831e436',
   allowCustomImage: true,
   imagePullPolicy: 'IfNotPresent',
   customImage: '',

diff --git a/components/crud-web-apps/jupyter/manifests/base/configs/spawner_ui_config.yaml b/components/crud-web-apps/jupyter/manifests/base/configs/spawner_ui_config.yaml
@@ -17,23 +17,23 @@
 spawnerFormDefaults:
   image:
     # The container Image for the user's Jupyter Notebook
-    value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-scipy:v1.5.0
+    value: docker.io/kubeflownotebookswg/notebook-servers/jupyter-scipy:v1.6.0-rc.0
     # The list of available standard container Images
     options:
-    - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-scipy:v1.5.0
-    - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-pytorch-full:v1.5.0
-    - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-pytorch-cuda-full:v1.5.0
-    - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-tensorflow-full:v1.5.0
-    - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-tensorflow-cuda-full:v1.5.0
+    - docker.io/kubeflownotebookswg/notebook-servers/jupyter-scipy:v1.6.0-rc.0
+    - docker.io/kubeflownotebookswg/notebook-servers/jupyter-pytorch-full:v1.6.0-rc.0
+    - docker.io/kubeflownotebookswg/notebook-servers/jupyter-pytorch-cuda-full:v1.6.0-rc.0
+    - docker.io/kubeflownotebookswg/notebook-servers/jupyter-tensorflow-full:v1.6.0-rc.0
+    - docker.io/kubeflownotebookswg/notebook-servers/jupyter-tensorflow-cuda-full:v1.6.0-rc.0
   imageGroupOne:
     # The container Image for the user's Group One Server
     # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /`
     # is applied to notebook in this group, configuring
     # the Istio rewrite for containers that host their web UI at `/`
-    value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/codeserver-python:v1.5.0
+    value: docker.io/kubeflownotebookswg/notebook-servers/codeserver-python:v1.6.0-rc.0
     # The list of available standard container Images
     options:
-    - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/codeserver-python:v1.5.0
+    - docker.io/kubeflownotebookswg/notebook-servers/codeserver-python:v1.6.0-rc.0
   imageGroupTwo:
     # The container Image for the user's Group Two Server
     # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /`
@@ -42,10 +42,10 @@ spawnerFormDefaults:
     # The annotation `notebooks.kubeflow.org/http-headers-request-set`
     # is applied to notebook in this group, configuring Istio
     # to add the `X-RStudio-Root-Path` header to requests
-    value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/rstudio-tidyverse:v1.5.0
+    value: docker.io/kubeflownotebookswg/notebook-servers/rstudio-tidyverse:v1.6.0-rc.0
     # The list of available standard container Images
     options:
-    - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/rstudio-tidyverse:v1.5.0
+    - docker.io/kubeflownotebookswg/notebook-servers/rstudio-tidyverse:v1.6.0-rc.0
   # If true, hide registry and/or tag name in the image selection dropdown
   hideRegistry: true
   hideTag: false

diff --git a/components/crud-web-apps/jupyter/manifests/base/deployment.yaml b/components/crud-web-apps/jupyter/manifests/base/deployment.yaml
@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
       - name: jupyter-web-app
-        image: public.ecr.aws/j1r0q0g6/notebooks/jupyter-web-app
+        image: docker.io/kubeflownotebookswg/jupyter-web-app
         ports:
         - containerPort: 5000
         volumeMounts:

diff --git a/components/crud-web-apps/jupyter/manifests/base/kustomization.yaml b/components/crud-web-apps/jupyter/manifests/base/kustomization.yaml
@@ -21,9 +21,8 @@ commonLabels:
   app: jupyter-web-app
   kustomize.component: jupyter-web-app
 images:
-- name: public.ecr.aws/j1r0q0g6/notebooks/jupyter-web-app
-  newName: public.ecr.aws/j1r0q0g6/notebooks/jupyter-web-app
-  newTag: v1.5.0
+- name: docker.io/kubeflownotebookswg/jupyter-web-app
+  newTag: v1.6.0-rc.0
 # We need the name to be unique without the suffix because the original name is what
 # gets used with patches
 configMapGenerator:

diff --git a/components/crud-web-apps/tensorboards/Makefile b/components/crud-web-apps/tensorboards/Makefile
@@ -1,5 +1,5 @@
 GIT_TAG ?= $(shell git describe --tags --always)
-IMG ?= public.ecr.aws/j1r0q0g6/notebooks/tensorboards-web-app
+IMG ?= docker.io/kubeflownotebookswg/tensorboards-web-app
 DOCKERFILE=tensorboards/Dockerfile
 
 docker-build:

diff --git a/components/crud-web-apps/tensorboards/manifests/base/deployment.yaml b/components/crud-web-apps/tensorboards/manifests/base/deployment.yaml
@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
       - name: tensorboards-web-app
-        image: public.ecr.aws/j1r0q0g6/notebooks/tensorboards-web-app
+        image: docker.io/kubeflownotebookswg/tensorboards-web-app
         ports:
         - containerPort: 5000
         env:

diff --git a/components/crud-web-apps/tensorboards/manifests/base/kustomization.yaml b/components/crud-web-apps/tensorboards/manifests/base/kustomization.yaml
@@ -12,9 +12,8 @@ commonLabels:
   app: tensorboards-web-app
   kustomize.component: tensorboards-web-app
 images:
-- name: public.ecr.aws/j1r0q0g6/notebooks/tensorboards-web-app
-  newName: public.ecr.aws/j1r0q0g6/notebooks/tensorboards-web-app
-  newTag: v1.5.0
+- name: docker.io/kubeflownotebookswg/tensorboards-web-app
+  newTag: v1.6.0-rc.0
 # We need the name to be unique without the suffix because the original name is what
 # gets used with patches
 configMapGenerator:

diff --git a/components/crud-web-apps/volumes/Makefile b/components/crud-web-apps/volumes/Makefile
@@ -1,4 +1,4 @@
-IMG ?= public.ecr.aws/j1r0q0g6/notebooks/volumes-web-app
+IMG ?= docker.io/kubeflownotebookswg/volumes-web-app
 TAG ?= $(shell git describe --tags --always)
 
 docker-build:

diff --git a/components/crud-web-apps/volumes/manifests/base/deployment.yaml b/components/crud-web-apps/volumes/manifests/base/deployment.yaml
@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
       - name: volumes-web-app
-        image: public.ecr.aws/j1r0q0g6/notebooks/volumes-web-app
+        image: docker.io/kubeflownotebookswg/volumes-web-app
         ports:
         - containerPort: 5000
         env:

diff --git a/components/crud-web-apps/volumes/manifests/base/kustomization.yaml b/components/crud-web-apps/volumes/manifests/base/kustomization.yaml
@@ -12,9 +12,8 @@ commonLabels:
   app: volumes-web-app
   kustomize.component: volumes-web-app
 images:
-- name: public.ecr.aws/j1r0q0g6/notebooks/volumes-web-app
-  newName: public.ecr.aws/j1r0q0g6/notebooks/volumes-web-app
-  newTag: v1.5.0
+- name: docker.io/kubeflownotebookswg/volumes-web-app
+  newTag: v1.6.0-rc.0
 # We need the name to be unique without the suffix because the original name is what
 # gets used with patches
 configMapGenerator:

diff --git a/components/notebook-controller/Makefile b/components/notebook-controller/Makefile
@@ -1,6 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= public.ecr.aws/j1r0q0g6/notebooks/notebook-controller
+IMG ?= docker.io/kubeflownotebookswg/notebook-controller
 TAG ?= $(shell git describe --tags --always)
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.

diff --git a/components/notebook-controller/README.md b/components/notebook-controller/README.md
@@ -21,7 +21,7 @@ spec:
     spec:
       containers:
         - name: my-notebook
-          image: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter:master
+          image: docker.io/kubeflownotebookswg/notebook-servers/jupyter:master
           args:
             [
               "start.sh",

diff --git a/components/notebook-controller/config/base/kustomization.yaml b/components/notebook-controller/config/base/kustomization.yaml
@@ -3,6 +3,5 @@ kind: Kustomization
 resources:
 - ../default
 images:
-- name: public.ecr.aws/j1r0q0g6/notebooks/notebook-controller
-  newName: public.ecr.aws/j1r0q0g6/notebooks/notebook-controller
-  newTag: v1.5.0
+- name: docker.io/kubeflownotebookswg/notebook-controller
+  newTag: v1.6.0-rc.0
diff --git a/components/notebook-controller/config/manager/manager.yaml b/components/notebook-controller/config/manager/manager.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: manager
-        image: public.ecr.aws/j1r0q0g6/notebooks/notebook-controller
+        image: docker.io/kubeflownotebookswg/notebook-controller
         command:
           - /manager
         env:

diff --git a/components/notebook-controller/config/samples/_v1_notebook.yaml b/components/notebook-controller/config/samples/_v1_notebook.yaml
@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
         - name: notebook-sample-v1
-          image: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter:v1.5.0-rc.1
+          image: docker.io/kubeflownotebookswg/notebook-servers/jupyter:v1.5.0-rc.1
diff --git a/components/notebook-controller/config/samples/_v1alpha1_notebook.yaml b/components/notebook-controller/config/samples/_v1alpha1_notebook.yaml
@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
         - name: notebook-sample-v1
-          image: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter:v1.5.0-rc.1
+          image: docker.io/kubeflownotebookswg/notebook-servers/jupyter:v1.5.0-rc.1
diff --git a/components/notebook-controller/config/samples/_v1beta1_notebook.yaml b/components/notebook-controller/config/samples/_v1beta1_notebook.yaml
@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
         - name: notebook-sample-v1
-          image: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter:v1.5.0-rc.1
+          image: docker.io/kubeflownotebookswg/notebook-servers/jupyter:v1.5.0-rc.1
diff --git a/components/profile-controller/config/base/kustomization.yaml b/components/profile-controller/config/base/kustomization.yaml
@@ -10,9 +10,8 @@ patchesStrategicMerge:
 - patches/manager.yaml
 
 images:
-- name: public.ecr.aws/j1r0q0g6/notebooks/profile-controller
-  newName: public.ecr.aws/j1r0q0g6/notebooks/profile-controller
-  newTag: v1.5.0
+- name: docker.io/kubeflownotebookswg/profile-controller
+  newTag: v1.6.0-rc.0
 
 configMapGenerator:
 - name: namespace-labels-data

diff --git a/components/profile-controller/config/manager/manager.yaml b/components/profile-controller/config/manager/manager.yaml
@@ -28,7 +28,7 @@ spec:
         envFrom:
           - configMapRef:
               name: config
-        image: public.ecr.aws/j1r0q0g6/notebooks/profile-controller
+        image: docker.io/kubeflownotebookswg/profile-controller
         imagePullPolicy: Always
         name: manager
         livenessProbe:

diff --git a/components/profile-controller/config/overlays/kubeflow/kustomization.yaml b/components/profile-controller/config/overlays/kubeflow/kustomization.yaml
@@ -27,6 +27,5 @@ vars:
     apiVersion: v1
 
 images:
-- name: public.ecr.aws/j1r0q0g6/notebooks/access-management
-  newName: public.ecr.aws/j1r0q0g6/notebooks/access-management
-  newTag: v1.5.0
+- name: docker.io/kubeflownotebookswg/kfam
+  newTag: v1.6.0-rc.0
diff --git a/components/profile-controller/config/overlays/kubeflow/patches/kfam.yaml b/components/profile-controller/config/overlays/kubeflow/patches/kfam.yaml
@@ -20,7 +20,7 @@ spec:
         envFrom:
           - configMapRef:
               name: config
-        image: public.ecr.aws/j1r0q0g6/notebooks/access-management
+        image: docker.io/kubeflownotebookswg/kfam
         imagePullPolicy: Always
         name: kfam
         livenessProbe:

diff --git a/components/tensorboard-controller/config/base/kustomization.yaml b/components/tensorboard-controller/config/base/kustomization.yaml
@@ -11,6 +11,5 @@ configMapGenerator:
 patchesStrategicMerge:
 - patches/add_controller_config.yaml
 images:
-- name: public.ecr.aws/j1r0q0g6/notebooks/tensorboard-controller
-  newName: public.ecr.aws/j1r0q0g6/notebooks/tensorboard-controller
-  newTag: v1.5.0
+- name: docker.io/kubeflownotebookswg/tensorboard-controller
+  newTag: v1.6.0-rc.0
diff --git a/components/tensorboard-controller/config/manager/manager.yaml b/components/tensorboard-controller/config/manager/manager.yaml
@@ -29,7 +29,7 @@ spec:
       containers:
         - command:
             - /manager
-          image: public.ecr.aws/j1r0q0g6/notebooks/tensorboard-controller
+          image: docker.io/kubeflownotebookswg/tensorboard-controller
           name: manager
           securityContext:
             allowPrivilegeEscalation: false