Removed traces of argoserver from default deployment.

Signed-off-by: Achyut Madhusudan <amadhusu@redhat.com>
opendatahub-io · Mar 6, 2024 · 690fe8f · 690fe8f
1 parent 344c84f
commit 690fe8f
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 195 deletions.
diff --git a/.github/resources/argo-lite/kustomization.yaml b/.github/resources/argo-lite/kustomization.yaml
@@ -3,5 +3,4 @@ kind: Kustomization
 namespace: opendatahub
 resources:
   - ../../../config/overlays/make-argodeploy
-patchesStrategicMerge:
-  - patch/argo_server_deployment.yaml
+
diff --git a/.github/resources/argo-lite/patch/argo_server_deployment.yaml b/.github/resources/argo-lite/patch/argo_server_deployment.yaml
diff --git a/.github/workflows/kind-integration.yml b/.github/workflows/kind-integration.yml
@@ -76,10 +76,9 @@ jobs:
           make podman-push -e IMG="${DSPO_IMAGE}"
           make deploy-kind -e IMG="${DSPO_IMAGE}"
 
-      - name: Wait for DSPO and Argo deployment
+      - name: Wait for DSPO
         run: |
           kubectl wait -n opendatahub --timeout=60s --for=condition=Available=true deployment data-science-pipelines-operator-controller-manager
-          kubectl wait -n opendatahub --timeout=60s --for=condition=Available=true deployment argo-server
 
       - name: Create DSPA Namespace
         run: |

diff --git a/config/argo/clusterrole.argo-server-cluster-role.yaml b/config/argo/clusterrole.argo-server-cluster-role.yaml
diff --git a/config/argo/clusterrolebinding.argo-server-binding.yaml b/config/argo/clusterrolebinding.argo-server-binding.yaml
diff --git a/config/argo/deployment.argo-server.yaml b/config/argo/deployment.argo-server.yaml
diff --git a/config/argo/kustomization.yaml b/config/argo/kustomization.yaml
@@ -11,17 +11,12 @@ resources:
 - clusterrole.argo-aggregate-to-edit.yaml
 - clusterrole.argo-aggregate-to-view.yaml
 - clusterrole.argo-cluster-role.yaml
-- clusterrole.argo-server-cluster-role.yaml
 - clusterrolebinding.argo-binding.yaml
-- clusterrolebinding.argo-server-binding.yaml
 - configmap.workflow-controller-configmap.yaml
-- deployment.argo-server.yaml
 # - deployment.workflow-controller.yaml
 # - priorityclass.yaml
 - role.argo.yaml
 - rolebinding.argo-binding.yaml
-- service.argo-server.yaml
-- serviceaccount.argo-server.yaml
 - serviceaccount.argo.yaml
 
 # CRDs only needed for PNS executors

diff --git a/config/argo/service.argo-server.yaml b/config/argo/service.argo-server.yaml
diff --git a/config/argo/serviceaccount.argo-server.yaml b/config/argo/serviceaccount.argo-server.yaml
diff --git a/config/base/params.env b/config/base/params.env
@@ -15,7 +15,6 @@ IMAGESV2_ARGO_MLMDGRPC=quay.io/opendatahub/ds-pipelines-metadata-grpc:latest
 IMAGESV2_ARGO_MLMDWRITER=quay.io/opendatahub/ds-pipelines-metadata-writer:latest
 IMAGESV2_ARGO_WORKFLOWCONTROLLER=quay.io/opendatahub/ds-pipelines-argo-workflowcontroller:3.3.10-upstream
 IMAGESV2_ARGO_ARGOEXEC=quay.io/opendatahub/ds-pipelines-argo-argoexec:3.3.10-upstream
-IMAGES_ARGO_SERVER=quay.io/opendatahub/ds-pipelines-argo-server:3.3.10-upstream
 V2_LAUNCHER_IMAGE=quay.io/opendatahub/ds-pipelines-launcher:latest
 V2_DRIVER_IMAGE=quay.io/opendatahub/ds-pipelines-driver:latest
 IMAGES_CACHE=registry.access.redhat.com/ubi8/ubi-minimal:8.8

diff --git a/config/overlays/make-argodeploy/argo-server-image-patch.yaml b/config/overlays/make-argodeploy/argo-server-image-patch.yaml
diff --git a/config/overlays/make-argodeploy/kustomization.yaml b/config/overlays/make-argodeploy/kustomization.yaml
@@ -4,12 +4,3 @@ namespace: opendatahub
 resources:
 - ../../argo
 
-# This patch is to override the `$(IMAGES_ARGO_SERVER)` param in config/argo
-# It is then overwridden by the `images` field further down, allowing us patch
-# the image from this overlays root kustomization `images` field.
-patchesStrategicMerge:
-- argo-server-image-patch.yaml
-images:
-- name: quay.io/argoproj/argocli
-  newName: quay.io/opendatahub/ds-pipelines-argo-server
-  newTag: 3.3.10-upstream