Cherry-picks for v1.5-branch before cutting RC1 (kubeflow#2138)

* tests: Scripts for e2e tests (kubeflow#2128) * remove old test files Signed-off-by: Kimonas Sotirchos <[email protected]> * gitignore: Don't track pyc files Signed-off-by: Kimonas Sotirchos <[email protected]> * flake8: Introduce linting file Signed-off-by: Kimonas Sotirchos <[email protected]> * hack: Introduce scripts for cluster manipulation Signed-off-by: Kimonas Sotirchos <[email protected]> * tests: Add e2e test Signed-off-by: Kimonas Sotirchos <[email protected]> * GH action for running e2e test Signed-off-by: Kimonas Sotirchos <[email protected]> * Reduce the installed components and system reqs Signed-off-by: Kimonas Sotirchos <[email protected]> * kserve: Add simple kustomization file To avoid having to use --load_restrictor none we'll need to wrap the KServe manifests inside a kustomization.yaml file. Signed-off-by: Kimonas Sotirchos <[email protected]> * unittests: Fix unit tests Signed-off-by: Kimonas Sotirchos <[email protected]> * gh: Remove action for e2e tests We should use prow instead to trigger our e2e tests. Signed-off-by: Kimonas Sotirchos <[email protected]> * Add networkpolicies under /contrib/networkpolicies (kubeflow#2121) * Create .gitkeep * Add files via upload * Create OWNERS * Create README.md * Delete default-deny-not-istio-system.yaml * Create default-allow-same-namespace.yaml * Create centraldashboard.yaml * Create jupyter-web-app.yaml * Create katib-ui.yaml * Create kfserving-models-web-app.yaml * Create ml-pipeline-ui.yaml * Update ml-pipeline.yaml * Create volumes-web-app.yaml * Update kustomization.yaml * Update OWNERS * Sync kubeflow pipelines manifests 1.8.0 rc.2 (kubeflow#2131) * hack: Update pipelines sync script to change README Signed-off-by: Kimonas Sotirchos <[email protected]> * Update kubeflow/pipelines manifests from 1.8.0-rc.2 * Sync kubeflow kubeflow manifests v1.5.0 rc.1 (kubeflow#2134) * hack: Sync README for kubeflow/kubeflow sync-script Extend the sync-script for kubeflow/kubeflow to also update the components versions in the readme. Signed-off-by: Kimonas Sotirchos <[email protected]> * Update kubeflow/kubeflow manifests from v1.5.0-rc.1 * Sync kserve/models-web-app manifests (kubeflow#2135) * kserve: Rename from upstream to kserve We will be including both kserve/kserve and kserve/models-web-app into the manifests, so the names will need to reflect this. Signed-off-by: Kimonas Sotirchos <[email protected]> * kserve: Add manifests for the models-web-app Include the MWA manifests from the v0.7.0 tag. https://github.com/kserve/models-web-app/tree/v0.7.0 Signed-off-by: Kimonas Sotirchos <[email protected]> * kserve: Include both kserve and mwa manifests Signed-off-by: Kimonas Sotirchos <[email protected]> * Update kubeflow/kfp-tekton manifests from v1.1.1 (kubeflow#2141) * hack: Update tekton script to edit README The hack script for updating the kfp-tekton manifests should also be updating the README file as well. Signed-off-by: Kimonas Sotirchos <[email protected]> * Update kubeflow/kfp-tekton manifests from v1.1.1 * Update manifests for Katib v0.13.0-rc.1 release (kubeflow#2139) * Update manifests for Katib v0.13.0-rc.1 release * Change README * readme: Remove MPI reference and add ingress distributions link (kubeflow#2143) * Closes kubeflow#1963 * Remove unused MPI reference (PR kubeflow#2119) * Update kubeflow/pipelines manifests from 1.8.0 (kubeflow#2144) Signed-off-by: Kimonas Sotirchos <[email protected]> * hack: Don't error if namespace kubeflow exists (kubeflow#2140) The helper setup scripts should not error when the namespaces already exist. Signed-off-by: Kimonas Sotirchos <[email protected]> Co-authored-by: juliusvonkohout <[email protected]> Co-authored-by: Andrey Velichkevich <[email protected]> Co-authored-by: a9p <[email protected]>
VaishnaviHire · Aug 11, 2022 · a731688 · a731688
1 parent 83de7cf
commit a731688
Show file tree

Hide file tree

Showing 44 changed files with 455 additions and 3 deletions.
diff --git a/apps/admission-webhook/upstream/base/kustomization.yaml b/apps/admission-webhook/upstream/base/kustomization.yaml
@@ -14,8 +14,14 @@ commonLabels:
   app.kubernetes.io/component: poddefaults
   app.kubernetes.io/name: poddefaults
 images:
+<<<<<<< HEAD
 - name: docker.io/kubeflownotebookswg/poddefaults-webhook
   newTag: v1.6.0-rc.1
+=======
+- name: public.ecr.aws/j1r0q0g6/notebooks/admission-webhook
+  newName: public.ecr.aws/j1r0q0g6/notebooks/admission-webhook
+  newTag: v1.5.0-rc.1
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
 namespace: kubeflow
 generatorOptions:
   disableNameSuffixHash: true

diff --git a/apps/centraldashboard/upstream/base/kustomization.yaml b/apps/centraldashboard/upstream/base/kustomization.yaml
@@ -16,8 +16,14 @@ commonLabels:
   app.kubernetes.io/component: centraldashboard
   app.kubernetes.io/name: centraldashboard
 images:
+<<<<<<< HEAD
 - name: docker.io/kubeflownotebookswg/centraldashboard
   newTag: v1.6.0-rc.1
+=======
+- name: public.ecr.aws/j1r0q0g6/notebooks/central-dashboard
+  newName: public.ecr.aws/j1r0q0g6/notebooks/central-dashboard
+  newTag: v1.5.0-rc.1
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
 configMapGenerator:
 - envs:
   - params.env

diff --git a/apps/jupyter/jupyter-web-app/upstream/base/configs/spawner_ui_config.yaml b/apps/jupyter/jupyter-web-app/upstream/base/configs/spawner_ui_config.yaml
@@ -17,6 +17,7 @@
 spawnerFormDefaults:
   image:
     # The container Image for the user's Jupyter Notebook
+<<<<<<< HEAD
     value: kubeflownotebookswg/jupyter-scipy:v1.6.0-rc.1
     # The list of available standard container Images
     options:
@@ -25,15 +26,32 @@ spawnerFormDefaults:
     - kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.6.0-rc.1
     - kubeflownotebookswg/jupyter-tensorflow-full:v1.6.0-rc.1
     - kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.6.0-rc.1
+=======
+    value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-scipy:v1.5.0-rc.1
+    # The list of available standard container Images
+    options:
+    - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-scipy:v1.5.0-rc.1
+    - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-pytorch-full:v1.5.0-rc.1
+    - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-pytorch-cuda-full:v1.5.0-rc.1
+    - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-tensorflow-full:v1.5.0-rc.1
+    - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-tensorflow-cuda-full:v1.5.0-rc.1
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
   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 `/`
+<<<<<<< HEAD
     value: kubeflownotebookswg/codeserver-python:v1.6.0-rc.1
     # The list of available standard container Images
     options:
     - kubeflownotebookswg/codeserver-python:v1.6.0-rc.1
+=======
+    value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/codeserver-python:v1.5.0-rc.1
+    # The list of available standard container Images
+    options:
+    - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/codeserver-python:v1.5.0-rc.1
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
   imageGroupTwo:
     # The container Image for the user's Group Two Server
     # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /`
@@ -42,10 +60,17 @@ 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
+<<<<<<< HEAD
     value: kubeflownotebookswg/rstudio-tidyverse:v1.6.0-rc.1
     # The list of available standard container Images
     options:
     - kubeflownotebookswg/rstudio-tidyverse:v1.6.0-rc.1
+=======
+    value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/rstudio-tidyverse:v1.5.0-rc.1
+    # The list of available standard container Images
+    options:
+    - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/rstudio-tidyverse:v1.5.0-rc.1
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
   # If true, hide registry and/or tag name in the image selection dropdown
   hideRegistry: true
   hideTag: false

diff --git a/apps/jupyter/jupyter-web-app/upstream/base/kustomization.yaml b/apps/jupyter/jupyter-web-app/upstream/base/kustomization.yaml
@@ -21,8 +21,14 @@ commonLabels:
   app: jupyter-web-app
   kustomize.component: jupyter-web-app
 images:
+<<<<<<< HEAD
 - name: docker.io/kubeflownotebookswg/jupyter-web-app
   newTag: v1.6.0-rc.1
+=======
+- name: public.ecr.aws/j1r0q0g6/notebooks/jupyter-web-app
+  newName: public.ecr.aws/j1r0q0g6/notebooks/jupyter-web-app
+  newTag: v1.5.0-rc.1
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
 # We need the name to be unique without the suffix because the original name is what
 # gets used with patches
 configMapGenerator:

diff --git a/apps/jupyter/notebook-controller/upstream/base/kustomization.yaml b/apps/jupyter/notebook-controller/upstream/base/kustomization.yaml
@@ -3,5 +3,11 @@ kind: Kustomization
 resources:
 - ../default
 images:
+<<<<<<< HEAD
 - name: docker.io/kubeflownotebookswg/notebook-controller
   newTag: v1.6.0-rc.1
+=======
+- name: public.ecr.aws/j1r0q0g6/notebooks/notebook-controller
+  newName: public.ecr.aws/j1r0q0g6/notebooks/notebook-controller
+  newTag: v1.5.0-rc.1
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
diff --git a/apps/katib/upstream/components/controller/katib-config.yaml b/apps/katib/upstream/components/controller/katib-config.yaml
@@ -8,13 +8,23 @@ data:
   metrics-collector-sidecar: |-
     {
       "StdOut": {
+<<<<<<< HEAD
         "image": "docker.io/kubeflowkatib/file-metrics-collector:v0.14.0-rc.0"
       },
       "File": {
         "image": "docker.io/kubeflowkatib/file-metrics-collector:v0.14.0-rc.0"
       },
       "TensorFlowEvent": {
         "image": "docker.io/kubeflowkatib/tfevent-metrics-collector:v0.14.0-rc.0",
+=======
+        "image": "docker.io/kubeflowkatib/file-metrics-collector:v0.13.0-rc.1"
+      },
+      "File": {
+        "image": "docker.io/kubeflowkatib/file-metrics-collector:v0.13.0-rc.1"
+      },
+      "TensorFlowEvent": {
+        "image": "docker.io/kubeflowkatib/tfevent-metrics-collector:v0.13.0-rc.1",
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
         "resources": {
           "limits": {
             "memory": "1Gi"
@@ -25,6 +35,7 @@ data:
   suggestion: |-
     {
       "random": {
+<<<<<<< HEAD
         "image": "docker.io/kubeflowkatib/suggestion-hyperopt:v0.14.0-rc.0"
       },
       "tpe": {
@@ -50,13 +61,41 @@ data:
       },
       "enas": {
         "image": "docker.io/kubeflowkatib/suggestion-enas:v0.14.0-rc.0",
+=======
+        "image": "docker.io/kubeflowkatib/suggestion-hyperopt:v0.13.0-rc.1"
+      },
+      "tpe": {
+        "image": "docker.io/kubeflowkatib/suggestion-hyperopt:v0.13.0-rc.1"
+      },
+      "grid": {
+        "image": "docker.io/kubeflowkatib/suggestion-chocolate:v0.13.0-rc.1"
+      },
+      "hyperband": {
+        "image": "docker.io/kubeflowkatib/suggestion-hyperband:v0.13.0-rc.1"
+      },
+      "bayesianoptimization": {
+        "image": "docker.io/kubeflowkatib/suggestion-skopt:v0.13.0-rc.1"
+      },
+      "cmaes": {
+        "image": "docker.io/kubeflowkatib/suggestion-goptuna:v0.13.0-rc.1"
+      },
+      "sobol": {
+        "image": "docker.io/kubeflowkatib/suggestion-goptuna:v0.13.0-rc.1"
+      },
+      "multivariate-tpe": {
+        "image": "docker.io/kubeflowkatib/suggestion-optuna:v0.13.0-rc.1"
+      },
+      "enas": {
+        "image": "docker.io/kubeflowkatib/suggestion-enas:v0.13.0-rc.1",
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
         "resources": {
           "limits": {
             "memory": "200Mi"
           }
         }
       },
       "darts": {
+<<<<<<< HEAD
         "image": "docker.io/kubeflowkatib/suggestion-darts:v0.14.0-rc.0"
       },
       "pbt": {
@@ -71,11 +110,18 @@ data:
             }
           }
         }
+=======
+        "image": "docker.io/kubeflowkatib/suggestion-darts:v0.13.0-rc.1"
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
       }
     }
   early-stopping: |-
     {
       "medianstop": {
+<<<<<<< HEAD
         "image": "docker.io/kubeflowkatib/earlystopping-medianstop:v0.14.0-rc.0"
+=======
+        "image": "docker.io/kubeflowkatib/earlystopping-medianstop:v0.13.0-rc.1"
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
       }
     }
diff --git a/apps/katib/upstream/components/controller/trial-templates.yaml b/apps/katib/upstream/components/controller/trial-templates.yaml
@@ -15,7 +15,11 @@ data:
         spec:
           containers:
             - name: training-container
+<<<<<<< HEAD
               image: docker.io/kubeflowkatib/mxnet-mnist:v0.14.0-rc.0
+=======
+              image: docker.io/kubeflowkatib/mxnet-mnist:v0.13.0-rc.1
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
               command:
                 - "python3"
                 - "/opt/mxnet-mnist/mnist.py"
@@ -33,7 +37,11 @@ data:
         spec:
           containers:
             - name: training-container
+<<<<<<< HEAD
               image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v0.14.0-rc.0
+=======
+              image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v0.13.0-rc.1
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
               command:
                 - python3
                 - -u
@@ -54,7 +62,12 @@ data:
             spec:
               containers:
                 - name: pytorch
+<<<<<<< HEAD
                   image: docker.io/kubeflowkatib/pytorch-mnist:v0.14.0-rc.0
+=======
+                  image: docker.io/kubeflowkatib/pytorch-mnist:v0.13.0-rc.1
+                  imagePullPolicy: Always
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
                   command:
                     - "python3"
                     - "/opt/pytorch-mnist/mnist.py"
@@ -68,7 +81,12 @@ data:
             spec:
               containers:
                 - name: pytorch
+<<<<<<< HEAD
                   image: docker.io/kubeflowkatib/pytorch-mnist:v0.14.0-rc.0
+=======
+                  image: docker.io/kubeflowkatib/pytorch-mnist:v0.13.0-rc.1
+                  imagePullPolicy: Always
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
                   command:
                     - "python3"
                     - "/opt/pytorch-mnist/mnist.py"

diff --git a/apps/katib/upstream/installs/katib-cert-manager/kustomization.yaml b/apps/katib/upstream/installs/katib-cert-manager/kustomization.yaml
@@ -22,13 +22,23 @@ resources:
 images:
   - name: docker.io/kubeflowkatib/katib-controller
     newName: docker.io/kubeflowkatib/katib-controller
+<<<<<<< HEAD
     newTag: v0.14.0-rc.0
   - name: docker.io/kubeflowkatib/katib-db-manager
     newName: docker.io/kubeflowkatib/katib-db-manager
     newTag: v0.14.0-rc.0
   - name: docker.io/kubeflowkatib/katib-ui
     newName: docker.io/kubeflowkatib/katib-ui
     newTag: v0.14.0-rc.0
+=======
+    newTag: v0.13.0-rc.1
+  - name: docker.io/kubeflowkatib/katib-db-manager
+    newName: docker.io/kubeflowkatib/katib-db-manager
+    newTag: v0.13.0-rc.1
+  - name: docker.io/kubeflowkatib/katib-ui
+    newName: docker.io/kubeflowkatib/katib-ui
+    newTag: v0.13.0-rc.1
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
 
 patchesStrategicMerge:
   - patches/katib-cert-injection.yaml

diff --git a/apps/katib/upstream/installs/katib-external-db/kustomization.yaml b/apps/katib/upstream/installs/katib-external-db/kustomization.yaml
@@ -20,6 +20,7 @@ resources:
 images:
   - name: docker.io/kubeflowkatib/katib-controller
     newName: docker.io/kubeflowkatib/katib-controller
+<<<<<<< HEAD
     newTag: v0.14.0-rc.0
   - name: docker.io/kubeflowkatib/katib-db-manager
     newName: docker.io/kubeflowkatib/katib-db-manager
@@ -30,6 +31,18 @@ images:
   - name: docker.io/kubeflowkatib/cert-generator
     newName: docker.io/kubeflowkatib/cert-generator
     newTag: v0.14.0-rc.0
+=======
+    newTag: v0.13.0-rc.1
+  - name: docker.io/kubeflowkatib/katib-db-manager
+    newName: docker.io/kubeflowkatib/katib-db-manager
+    newTag: v0.13.0-rc.1
+  - name: docker.io/kubeflowkatib/katib-ui
+    newName: docker.io/kubeflowkatib/katib-ui
+    newTag: v0.13.0-rc.1
+  - name: docker.io/kubeflowkatib/cert-generator
+    newName: docker.io/kubeflowkatib/cert-generator
+    newTag: v0.13.0-rc.1
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
 patchesStrategicMerge:
   - patches/db-manager.yaml
 # Modify katib-mysql-secrets with parameters for the DB.

diff --git a/apps/katib/upstream/installs/katib-openshift/kustomization.yaml b/apps/katib/upstream/installs/katib-openshift/kustomization.yaml
@@ -30,13 +30,23 @@ resources:
 images:
   - name: docker.io/kubeflowkatib/katib-controller
     newName: docker.io/kubeflowkatib/katib-controller
+<<<<<<< HEAD
     newTag: v0.14.0-rc.0
   - name: docker.io/kubeflowkatib/katib-db-manager
     newName: docker.io/kubeflowkatib/katib-db-manager
     newTag: v0.14.0-rc.0
   - name: docker.io/kubeflowkatib/katib-ui
     newName: docker.io/kubeflowkatib/katib-ui
     newTag: v0.14.0-rc.0
+=======
+    newTag: v0.13.0-rc.1
+  - name: docker.io/kubeflowkatib/katib-db-manager
+    newName: docker.io/kubeflowkatib/katib-db-manager
+    newTag: v0.13.0-rc.1
+  - name: docker.io/kubeflowkatib/katib-ui
+    newName: docker.io/kubeflowkatib/katib-ui
+    newTag: v0.13.0-rc.1
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
 
 patchesJson6902:
   # Annotate Service to delegate TLS-secret generation to OpenShift service controller

diff --git a/apps/katib/upstream/installs/katib-standalone/kustomization.yaml b/apps/katib/upstream/installs/katib-standalone/kustomization.yaml
@@ -22,6 +22,7 @@ resources:
 images:
   - name: docker.io/kubeflowkatib/katib-controller
     newName: docker.io/kubeflowkatib/katib-controller
+<<<<<<< HEAD
     newTag: v0.14.0-rc.0
   - name: docker.io/kubeflowkatib/katib-db-manager
     newName: docker.io/kubeflowkatib/katib-db-manager
@@ -32,3 +33,15 @@ images:
   - name: docker.io/kubeflowkatib/cert-generator
     newName: docker.io/kubeflowkatib/cert-generator
     newTag: v0.14.0-rc.0
+=======
+    newTag: v0.13.0-rc.1
+  - name: docker.io/kubeflowkatib/katib-db-manager
+    newName: docker.io/kubeflowkatib/katib-db-manager
+    newTag: v0.13.0-rc.1
+  - name: docker.io/kubeflowkatib/katib-ui
+    newName: docker.io/kubeflowkatib/katib-ui
+    newTag: v0.13.0-rc.1
+  - name: docker.io/kubeflowkatib/cert-generator
+    newName: docker.io/kubeflowkatib/cert-generator
+    newTag: v0.13.0-rc.1
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
diff --git a/apps/katib/upstream/installs/katib-with-kubeflow/kustomization.yaml b/apps/katib/upstream/installs/katib-with-kubeflow/kustomization.yaml
@@ -10,13 +10,23 @@ resources:
 images:
   - name: docker.io/kubeflowkatib/katib-controller
     newName: docker.io/kubeflowkatib/katib-controller
+<<<<<<< HEAD
     newTag: v0.14.0-rc.0
   - name: docker.io/kubeflowkatib/katib-db-manager
     newName: docker.io/kubeflowkatib/katib-db-manager
     newTag: v0.14.0-rc.0
   - name: docker.io/kubeflowkatib/katib-ui
     newName: docker.io/kubeflowkatib/katib-ui
     newTag: v0.14.0-rc.0
+=======
+    newTag: v0.13.0-rc.1
+  - name: docker.io/kubeflowkatib/katib-db-manager
+    newName: docker.io/kubeflowkatib/katib-db-manager
+    newTag: v0.13.0-rc.1
+  - name: docker.io/kubeflowkatib/katib-ui
+    newName: docker.io/kubeflowkatib/katib-ui
+    newTag: v0.13.0-rc.1
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
 
 patchesStrategicMerge:
   - patches/remove-namespace.yaml

diff --git a/apps/kfp-tekton/upstream/base/cache-deployer/kustomization.yaml b/apps/kfp-tekton/upstream/base/cache-deployer/kustomization.yaml
@@ -10,4 +10,8 @@ commonLabels:
   app: cache-deployer
 images:
   - name: gcr.io/ml-pipeline/cache-deployer
+<<<<<<< HEAD
     newTag: 1.8.1
+=======
+    newTag: 1.8.0-rc.3
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))
diff --git a/apps/kfp-tekton/upstream/base/cache/kustomization.yaml b/apps/kfp-tekton/upstream/base/cache/kustomization.yaml
@@ -11,4 +11,8 @@ commonLabels:
 images:
   - name: gcr.io/ml-pipeline/cache-server
     newName: docker.io/aipipeline/cache-server
+<<<<<<< HEAD
     newTag: 1.2.1
+=======
+    newTag: 1.1.1
+>>>>>>> 9195ebfb (Cherry-picks for v1.5-branch before cutting RC1 (#2138))