release: Use DockerHub for all images (kubeflow#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>
apo-ger · Dec 8, 2022 · 95d113d · 95d113d
1 parent ed9d908
commit 95d113d
Show file tree

Hide file tree

Showing 20 changed files with 65 additions and 61 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,9 @@ 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
+  newName: 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,9 @@ 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
+  newName: docker.io/kubeflownotebookswg/centraldashboard
+  newTag: v1.6.0-rc.0
 configMapGenerator:
 - envs:
   - params.env

diff --git a/components/crud-web-apps/jupyter/manifests/base/deployment.yaml b/components/crud-web-apps/jupyter/manifests/base/deployment.yaml
@@ -8,7 +8,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,9 @@ 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
+  newName: 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/manifests/base/deployment.yaml b/components/crud-web-apps/tensorboards/manifests/base/deployment.yaml
@@ -8,7 +8,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,9 @@ 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
+  newName: 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/manifests/base/deployment.yaml b/components/crud-web-apps/volumes/manifests/base/deployment.yaml
@@ -8,7 +8,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,9 @@ 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
+  newName: 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/config/base/kustomization.yaml b/components/notebook-controller/config/base/kustomization.yaml
@@ -3,6 +3,6 @@ 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
+  newName: 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/profile-controller/config/base/kustomization.yaml b/components/profile-controller/config/base/kustomization.yaml
@@ -10,9 +10,9 @@ patchesStrategicMerge:
 - patches/manager.yaml
 
 images:
-- name: public.ecr.aws/j1r0q0g6/notebooks/profile-controller
-  newName: gcr.io/arrikto-playground/profile-controller
-  newTag: v1.4-rc.0-200-gb79289d1
+- name: docker.io/kubeflownotebookswg/profile-controller
+  newName: 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: IfNotPresent
         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,6 @@ 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
+  newName: 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: IfNotPresent
         name: kfam
         livenessProbe:

diff --git a/components/tensorboard-controller/config/base/kustomization.yaml b/components/tensorboard-controller/config/base/kustomization.yaml
@@ -11,6 +11,6 @@ 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
+  newName: 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

diff --git a/releasing/update-manifests-images b/releasing/update-manifests-images
@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 
-import sys
-import logging
 import argparse
-import ruamel.yaml
+import logging
+import sys
 
+import ruamel.yaml
 
 log = logging.getLogger(__name__)
 
@@ -53,8 +53,8 @@ apps = [
         "kustomization": "components/admission-webhook/manifests/base/kustomization.yaml",
         "images": [
             {
-                "name": "public.ecr.aws/j1r0q0g6/notebooks/admission-webhook",
-                "newName": "public.ecr.aws/j1r0q0g6/notebooks/admission-webhook",
+                "name": "docker.io/kubeflownotebookswg/poddefaults-webhook",
+                "newName": "docker.io/kubeflownotebookswg/poddefaults-webhook",
             },
         ],
     },
@@ -63,8 +63,8 @@ apps = [
         "kustomization": "components/centraldashboard/manifests/base/kustomization.yaml",
         "images": [
             {
-                "name": "public.ecr.aws/j1r0q0g6/notebooks/central-dashboard",
-                "newName": "public.ecr.aws/j1r0q0g6/notebooks/central-dashboard",
+                "name": "docker.io/kubeflownotebookswg/centraldashboard",
+                "newName": "docker.io/kubeflownotebookswg/centraldashboard",
             },
         ],
     },
@@ -73,8 +73,9 @@ apps = [
         "kustomization": "components/crud-web-apps/jupyter/manifests/base/kustomization.yaml",
         "images": [
             {
-                "name": "public.ecr.aws/j1r0q0g6/notebooks/jupyter-web-app",
-                "newName": "public.ecr.aws/j1r0q0g6/notebooks/jupyter-web-app",
+                "name": "docker.io/kubeflownotebookswg/jupyter-web-app",
+                "newName": "docker.io/kubeflownotebookswg/jupyter-web-app",
+
             },
         ],
     },
@@ -83,8 +84,8 @@ apps = [
         "kustomization": "components/crud-web-apps/tensorboards/manifests/base/kustomization.yaml",
         "images": [
             {
-                "name": "public.ecr.aws/j1r0q0g6/notebooks/tensorboards-web-app",
-                "newName": "public.ecr.aws/j1r0q0g6/notebooks/tensorboards-web-app",
+                "name": "docker.io/kubeflownotebookswg/tensorboards-web-app",
+                "newName": "docker.io/kubeflownotebookswg/tensorboards-web-app",
             },
         ],
     },
@@ -93,8 +94,8 @@ apps = [
         "kustomization": "components/crud-web-apps/volumes/manifests/base/kustomization.yaml",
         "images": [
             {
-                "name": "public.ecr.aws/j1r0q0g6/notebooks/volumes-web-app",
-                "newName": "public.ecr.aws/j1r0q0g6/notebooks/volumes-web-app",
+                "name": "docker.io/kubeflownotebookswg/volumes-web-app",
+                "newName": "docker.io/kubeflownotebookswg/volumes-web-app",
             },
         ],
     },
@@ -103,8 +104,8 @@ apps = [
         "kustomization": "components/notebook-controller/config/base/kustomization.yaml",
         "images": [
             {
-                "name": "public.ecr.aws/j1r0q0g6/notebooks/notebook-controller",
-                "newName": "public.ecr.aws/j1r0q0g6/notebooks/notebook-controller",
+                "name": "docker.io/kubeflownotebookswg/notebook-controller",
+                "newName": "docker.io/kubeflownotebookswg/notebook-controller",
             },
         ],
     },
@@ -113,8 +114,8 @@ apps = [
         "kustomization": "components/tensorboard-controller/config/base/kustomization.yaml",
         "images": [
             {
-                "name": "public.ecr.aws/j1r0q0g6/notebooks/tensorboard-controller",
-                "newName": "public.ecr.aws/j1r0q0g6/notebooks/tensorboard-controller",
+                "name": "docker.io/kubeflownotebookswg/tensorboard-controller",
+                "newName": "docker.io/kubeflownotebookswg/tensorboard-controller",
             },
         ],
     },
@@ -123,8 +124,8 @@ apps = [
         "kustomization": "components/profile-controller/config/base/kustomization.yaml",
         "images": [
             {
-                "name": "public.ecr.aws/j1r0q0g6/notebooks/profile-controller",
-                "newName": "public.ecr.aws/j1r0q0g6/notebooks/profile-controller",
+                "name": "docker.io/kubeflownotebookswg/profile-controller",
+                "newName": "docker.io/kubeflownotebookswg/profile-controller",
             },
         ],
     },
@@ -133,8 +134,8 @@ apps = [
         "kustomization": "components/profile-controller/config/overlays/kubeflow/kustomization.yaml",
         "images": [
             {
-                "name": "public.ecr.aws/j1r0q0g6/notebooks/access-management",
-                "newName": "public.ecr.aws/j1r0q0g6/notebooks/access-management",
+                "name": "docker.io/kubeflownotebookswg/kfam",
+                "newName": "docker.io/kubeflownotebookswg/kfam",
             },
         ],
     },
@@ -170,17 +171,20 @@ def update_manifests_images(apps, tag):
     with open(JWA_SPAWNER_CONFIG, "r") as f:
         jwa_config = yaml.load(f)
     for nb_type in ["image", "imageGroupTwo", "imageGroupOne"]:
-        jwa_config["spawnerFormDefaults"][nb_type]["value"] = change_image_tag(jwa_config["spawnerFormDefaults"][nb_type]["value"], tag)
+        jwa_config["spawnerFormDefaults"][nb_type]["value"] = change_image_tag(
+            jwa_config["spawnerFormDefaults"][nb_type]["value"], tag)
         for i in range(len(jwa_config["spawnerFormDefaults"][nb_type]["options"])):
-            jwa_config["spawnerFormDefaults"][nb_type]["options"][i] = change_image_tag(jwa_config["spawnerFormDefaults"][nb_type]["options"][i], tag)
+            jwa_config["spawnerFormDefaults"][nb_type]["options"][i] = change_image_tag(
+                jwa_config["spawnerFormDefaults"][nb_type]["options"][i], tag)
     with open(JWA_SPAWNER_CONFIG, "w") as f:
         yaml.dump(jwa_config, f)
 
 
 def change_image_tag(img, newTag):
     parts = img.split(":")
     if len(parts) != 2:
-        raise RuntimeError("Image `%s` doesn't have expected format <img>:<tag>")
+        raise RuntimeError(
+            "Image `%s` doesn't have expected format <img>:<tag>")
     return parts[0] + ":" + newTag
 
 

diff --git a/releasing/version/VERSION b/releasing/version/VERSION
@@ -1 +1 @@
-v1.5.0
+v1.6.0-rc.0