Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release: Use DockerHub for all images #6548

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion components/centraldashboard/manifests/base/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 2 additions & 3 deletions components/centraldashboard/manifests/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion components/crud-web-apps/jupyter/Makefile
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: /`
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: '',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: /`
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion components/crud-web-apps/tensorboards/Makefile
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion components/crud-web-apps/volumes/Makefile
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion components/notebook-controller/Makefile
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion components/notebook-controller/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions components/notebook-controller/config/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion components/notebook-controller/config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 2 additions & 3 deletions components/profile-controller/config/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion components/profile-controller/config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down