Skip to content

Commit

Permalink
Removed traces of argoserver from default deployment.
Browse files Browse the repository at this point in the history
Signed-off-by: Achyut Madhusudan <[email protected]>
  • Loading branch information
Achyut Madhusudan committed Mar 7, 2024
1 parent a35ad21 commit 3511d3c
Show file tree
Hide file tree
Showing 13 changed files with 1 addition and 204 deletions.
2 changes: 0 additions & 2 deletions .github/resources/argo-lite/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,3 @@ kind: Kustomization
namespace: opendatahub
resources:
- ../../../config/overlays/make-argodeploy
patchesStrategicMerge:
- patch/argo_server_deployment.yaml
17 changes: 0 additions & 17 deletions .github/resources/argo-lite/patch/argo_server_deployment.yaml

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/kind-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
66 changes: 0 additions & 66 deletions config/argo/clusterrole.argo-server-cluster-role.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions config/argo/clusterrolebinding.argo-server-binding.yaml

This file was deleted.

49 changes: 0 additions & 49 deletions config/argo/deployment.argo-server.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions config/argo/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 0 additions & 13 deletions config/argo/service.argo-server.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions config/argo/serviceaccount.argo-server.yaml

This file was deleted.

1 change: 0 additions & 1 deletion config/base/params.env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions config/overlays/make-argodeploy/argo-server-image-patch.yaml

This file was deleted.

10 changes: 0 additions & 10 deletions config/overlays/make-argodeploy/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,3 @@ kind: Kustomization
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
8 changes: 0 additions & 8 deletions config/overlays/odh/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,3 @@ resources:
- ../../argo
- ../../base
namespace: opendatahub
vars:
- name: IMAGES_ARGO_SERVER
objref:
kind: ConfigMap
name: dspo-parameters
apiVersion: v1
fieldref:
fieldpath: data.IMAGES_ARGO_SERVER

0 comments on commit 3511d3c

Please sign in to comment.