diff --git a/.github/resources/argo-lite/kustomization.yaml b/.github/resources/argo-lite/kustomization.yaml index 9c788ae12..66fb1b78d 100644 --- a/.github/resources/argo-lite/kustomization.yaml +++ b/.github/resources/argo-lite/kustomization.yaml @@ -3,5 +3,3 @@ 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 deleted file mode 100644 index 557410c61..000000000 --- a/.github/resources/argo-lite/patch/argo_server_deployment.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argo-server - namespace: argo -spec: - template: - spec: - containers: - - name: argo-server - resources: - limits: - cpu: 20m - memory: 500Mi - requests: - cpu: 20m - memory: 100Mi diff --git a/.github/workflows/kind-integration.yml b/.github/workflows/kind-integration.yml index 17b452771..5dabafddc 100644 --- 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 deleted file mode 100644 index 0ad3b0465..000000000 --- a/config/argo/clusterrole.argo-server-cluster-role.yaml +++ /dev/null @@ -1,66 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: argo-server-cluster-role -rules: -- apiGroups: - - "" - resources: - - configmaps - verbs: - - get - - watch - - list -- apiGroups: - - "" - resources: - - secrets - verbs: - - get - - create -- apiGroups: - - "" - resources: - - pods - - pods/exec - - pods/log - verbs: - - get - - list - - watch - - delete -- apiGroups: - - "" - resources: - - events - verbs: - - watch - - create - - patch -- apiGroups: - - "" - resources: - - serviceaccounts - verbs: - - get - - list - - watch -- apiGroups: - - argoproj.io - resources: - - eventsources - - sensors - - workflows - - workfloweventbindings - - workflowtemplates - - cronworkflows - - clusterworkflowtemplates - verbs: - - create - - get - - list - - watch - - update - - patch - - delete diff --git a/config/argo/clusterrolebinding.argo-server-binding.yaml b/config/argo/clusterrolebinding.argo-server-binding.yaml deleted file mode 100644 index 79b8df515..000000000 --- a/config/argo/clusterrolebinding.argo-server-binding.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: argo-server-binding -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: argo-server-cluster-role -subjects: -- kind: ServiceAccount - name: argo-server - namespace: argo diff --git a/config/argo/deployment.argo-server.yaml b/config/argo/deployment.argo-server.yaml deleted file mode 100644 index d775a9305..000000000 --- a/config/argo/deployment.argo-server.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argo-server - namespace: argo -spec: - selector: - matchLabels: - app: argo-server - template: - metadata: - labels: - app: argo-server - spec: - containers: - - args: - - server - env: [] - image: $(IMAGES_ARGO_SERVER) - name: argo-server - ports: - - containerPort: 2746 - name: web - readinessProbe: - httpGet: - path: / - port: 2746 - scheme: HTTPS - initialDelaySeconds: 10 - periodSeconds: 20 - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - readOnlyRootFilesystem: true - runAsNonRoot: true - volumeMounts: - - mountPath: /tmp - name: tmp - nodeSelector: - kubernetes.io/os: linux - securityContext: - runAsNonRoot: true - serviceAccountName: argo-server - volumes: - - emptyDir: {} - name: tmp diff --git a/config/argo/kustomization.yaml b/config/argo/kustomization.yaml index a43ab162a..2aa6deb55 100644 --- 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 deleted file mode 100644 index 9afb910c0..000000000 --- a/config/argo/service.argo-server.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: argo-server - namespace: argo -spec: - ports: - - name: web - port: 2746 - targetPort: 2746 - selector: - app: argo-server diff --git a/config/argo/serviceaccount.argo-server.yaml b/config/argo/serviceaccount.argo-server.yaml deleted file mode 100644 index 4d7a55bdb..000000000 --- a/config/argo/serviceaccount.argo-server.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: argo-server - namespace: argo diff --git a/config/base/params.env b/config/base/params.env index 12d7854d5..bc6e9e718 100644 --- 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 deleted file mode 100644 index 8ae36b631..000000000 --- a/config/overlays/make-argodeploy/argo-server-image-patch.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argo-server - namespace: argo -spec: - template: - spec: - containers: - - name: argo-server - image: quay.io/argoproj/argocli diff --git a/config/overlays/make-argodeploy/kustomization.yaml b/config/overlays/make-argodeploy/kustomization.yaml index 175dc37ff..a1e7bc832 100644 --- a/config/overlays/make-argodeploy/kustomization.yaml +++ b/config/overlays/make-argodeploy/kustomization.yaml @@ -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 diff --git a/config/overlays/odh/kustomization.yaml b/config/overlays/odh/kustomization.yaml index 155371795..3a2723293 100644 --- a/config/overlays/odh/kustomization.yaml +++ b/config/overlays/odh/kustomization.yaml @@ -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