Skip to content

Commit

Permalink
chore: switch to using gh container registry in manifests (#11526) (#…
Browse files Browse the repository at this point in the history
…11527)

This change switches majority of the images coming from gcr repository
to the ghcr repository. For this various manifests were updated, as well
as the hardcoded launcher/driver images. All images that are regularly
updated during the release process have been switched over to ghcr.

Signed-off-by: Humair Khan <[email protected]>
  • Loading branch information
HumairAK authored Jan 16, 2025
1 parent 2e47604 commit f26c1ae
Show file tree
Hide file tree
Showing 20 changed files with 41 additions and 41 deletions.
4 changes: 2 additions & 2 deletions backend/src/v2/compiler/argocompiler/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (
const (
volumeNameKFPLauncher = "kfp-launcher"
volumeNameCABundle = "ca-bundle"
DefaultLauncherImage = "gcr.io/ml-pipeline/kfp-launcher@sha256:bef55a344574a25c557256d7c66cb19edacfd2008d694e5b6bb5b612d59feae0"
DefaultLauncherImage = "ghcr.io/kubeflow/kfp-launcher:2.4.0"
LauncherImageEnvVar = "V2_LAUNCHER_IMAGE"
DefaultDriverImage = "gcr.io/ml-pipeline/kfp-driver@sha256:dc8b56a2eb071f30409828a8884d621092e68385af11a6c06aa9e9fbcfbb19de"
DefaultDriverImage = "ghcr.io/kubeflow/kfp-driver:2.4.0"
DriverImageEnvVar = "V2_DRIVER_IMAGE"
DefaultDriverCommand = "driver"
DriverCommandEnvVar = "V2_DRIVER_COMMAND"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
spec:
containers:
- name: main
image: gcr.io/ml-pipeline/cache-deployer:dummy
image: ghcr.io/kubeflow/kfp-cache-deployer:dummy
imagePullPolicy: Always
env:
- name: NAMESPACE_TO_WATCH
Expand Down
4 changes: 2 additions & 2 deletions manifests/kustomize/base/cache-deployer/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ resources:
commonLabels:
app: cache-deployer
images:
- name: gcr.io/ml-pipeline/cache-deployer
newTag: 2.3.0
- name: ghcr.io/kubeflow/kfp-cache-deployer
newTag: 2.4.0
2 changes: 1 addition & 1 deletion manifests/kustomize/base/cache/cache-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
capabilities:
drop:
- ALL
image: gcr.io/ml-pipeline/cache-server:dummy
image: ghcr.io/kubeflow/kfp-cache-server:dummy
env:
- name: DEFAULT_CACHE_STALENESS
valueFrom:
Expand Down
4 changes: 2 additions & 2 deletions manifests/kustomize/base/cache/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ resources:
commonLabels:
app: cache-server
images:
- name: gcr.io/ml-pipeline/cache-server
newTag: 2.3.0
- name: ghcr.io/kubeflow/kfp-cache-server
newTag: 2.4.0
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ def get_settings_from_env(controller_port=None,
Settings are pulled from the all-caps version of the setting name. The
following defaults are used if those environment variables are not set
to enable backwards compatibility with previous versions of this script:
visualization_server_image: gcr.io/ml-pipeline/visualization-server
visualization_server_image: ghcr.io/kubeflow/kfp-visualization-server
visualization_server_tag: value of KFP_VERSION environment variable
frontend_image: gcr.io/ml-pipeline/frontend
frontend_image: ghcr.io/kubeflow/kfp-frontend
frontend_tag: value of KFP_VERSION environment variable
disable_istio_sidecar: Required (no default)
minio_access_key: Required (no default)
Expand All @@ -51,11 +51,11 @@ def get_settings_from_env(controller_port=None,

settings["visualization_server_image"] = \
visualization_server_image or \
os.environ.get("VISUALIZATION_SERVER_IMAGE", "gcr.io/ml-pipeline/visualization-server")
os.environ.get("VISUALIZATION_SERVER_IMAGE", "ghcr.io/kubeflow/kfp-visualization-server")

settings["frontend_image"] = \
frontend_image or \
os.environ.get("FRONTEND_IMAGE", "gcr.io/ml-pipeline/frontend")
os.environ.get("FRONTEND_IMAGE", "ghcr.io/kubeflow/kfp-frontend")

# Look for specific tags for each image first, falling back to
# previously used KFP_VERSION environment variable for backwards
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
DATA_MISSING_PIPELINE_ENABLED = {"parent": {}, "children": {}}

# Default values when environments are not explicit
DEFAULT_FRONTEND_IMAGE = "gcr.io/ml-pipeline/frontend"
DEFAULT_VISUALIZATION_IMAGE = "gcr.io/ml-pipeline/visualization-server"
DEFAULT_FRONTEND_IMAGE = "ghcr.io/kubeflow/kfp-frontend"
DEFAULT_VISUALIZATION_IMAGE = "ghcr.io/kubeflow/kfp-visualization-server"

# Variables used for environment variable sets
VISUALIZATION_SERVER_IMAGE = "vis-image"
Expand Down
4 changes: 2 additions & 2 deletions manifests/kustomize/base/metadata/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ resources:
- metadata-envoy-service.yaml
- metadata-grpc-sa.yaml
images:
- name: gcr.io/ml-pipeline/metadata-envoy
newTag: 2.3.0
- name: ghcr.io/kubeflow/kfp-metadata-envoy
newTag: 2.4.0
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
spec:
containers:
- name: container
image: gcr.io/ml-pipeline/metadata-envoy:dummy
image: ghcr.io/kubeflow/kfp-metadata-envoy:dummy
ports:
- name: md-envoy
containerPort: 9090
Expand Down
24 changes: 12 additions & 12 deletions manifests/kustomize/base/pipeline/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ resources:
- viewer-sa.yaml
- kfp-launcher-configmap.yaml
images:
- name: gcr.io/ml-pipeline/api-server
newTag: 2.3.0
- name: gcr.io/ml-pipeline/persistenceagent
newTag: 2.3.0
- name: gcr.io/ml-pipeline/scheduledworkflow
newTag: 2.3.0
- name: gcr.io/ml-pipeline/frontend
newTag: 2.3.0
- name: gcr.io/ml-pipeline/viewer-crd-controller
newTag: 2.3.0
- name: gcr.io/ml-pipeline/visualization-server
newTag: 2.3.0
- name: ghcr.io/kubeflow/kfp-api-server
newTag: 2.4.0
- name: ghcr.io/kubeflow/kfp-persistence-agent
newTag: 2.4.0
- name: ghcr.io/kubeflow/kfp-scheduled-workflow-controller
newTag: 2.4.0
- name: ghcr.io/kubeflow/kfp-frontend
newTag: 2.4.0
- name: ghcr.io/kubeflow/kfp-viewer-crd-controller
newTag: 2.4.0
- name: ghcr.io/kubeflow/kfp-visualization-server
newTag: 2.4.0
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ resources:
- metadata-writer-rolebinding.yaml
- metadata-writer-sa.yaml
images:
- name: gcr.io/ml-pipeline/metadata-writer
newTag: 2.3.0
- name: ghcr.io/kubeflow/kfp-metadata-writer
newTag: 2.4.0
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: main
image: gcr.io/ml-pipeline/metadata-writer:dummy
image: ghcr.io/kubeflow/kfp-metadata-writer:dummy
env:
- name: NAMESPACE_TO_WATCH
valueFrom:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ spec:
secretKeyRef:
name: mlpipeline-minio-artifact
key: secretkey
image: gcr.io/ml-pipeline/api-server:dummy
image: ghcr.io/kubeflow/kfp-api-server:dummy
imagePullPolicy: IfNotPresent
name: ml-pipeline-api-server
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
value: "2"
- name: LOG_LEVEL
value: "info"
image: gcr.io/ml-pipeline/persistenceagent:dummy
image: ghcr.io/kubeflow/kfp-persistence-agent:dummy
imagePullPolicy: IfNotPresent
name: ml-pipeline-persistenceagent
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
containers:
- image: gcr.io/ml-pipeline/scheduledworkflow:dummy
- image: ghcr.io/kubeflow/kfp-scheduled-workflow-controller:dummy
imagePullPolicy: IfNotPresent
name: ml-pipeline-scheduledworkflow
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
configMap:
name: ml-pipeline-ui-configmap
containers:
- image: gcr.io/ml-pipeline/frontend:dummy
- image: ghcr.io/kubeflow/kfp-frontend:dummy
imagePullPolicy: IfNotPresent
name: ml-pipeline-ui
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
containers:
- image: gcr.io/ml-pipeline/viewer-crd-controller:dummy
- image: ghcr.io/kubeflow/kfp-viewer-crd-controller:dummy
imagePullPolicy: Always
name: ml-pipeline-viewer-crd
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
containers:
- image: gcr.io/ml-pipeline/visualization-server:dummy
- image: ghcr.io/kubeflow/kfp-visualization-server:dummy
imagePullPolicy: IfNotPresent
name: ml-pipeline-visualizationserver
ports:
Expand Down
4 changes: 2 additions & 2 deletions manifests/kustomize/env/gcp/inverse-proxy/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: gcr.io/ml-pipeline/inverse-proxy-agent
newTag: 2.3.0
- name: ghcr.io/kubeflow/kfp-inverse-proxy-agent
newTag: 2.4.0
resources:
- proxy-configmap.yaml
- proxy-deployment.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
hostNetwork: true
containers:
- image: gcr.io/ml-pipeline/inverse-proxy-agent:dummy
- image: ghcr.io/kubeflow/kfp-inverse-proxy-agent:dummy
imagePullPolicy: IfNotPresent
name: proxy-agent
serviceAccountName: proxy-agent-runner

0 comments on commit f26c1ae

Please sign in to comment.