From 7bc2f9b9194bed2bee5cf7f459bcc7490a3f4334 Mon Sep 17 00:00:00 2001 From: jsitu777 <59303945+jsitu777@users.noreply.github.com> Date: Fri, 13 Jan 2023 15:51:00 -0800 Subject: [PATCH] Disable minio for s3 related deployments (#541) **Which issue is resolved by this Pull Request:** Resolves # https://github.com/awslabs/kubeflow-manifests/issues/508 **Description of your changes:** - remove minio-pvc - remove minio deployment - remove minio-service **Testing:** - [ ] Unit tests pass - [x] e2e tests pass - Details about new tests (If this PR adds a new feature) - Details about any manual tests performed - configure s3-only deployment and make sure objects are presented in s3 buckets after pipeline run. --- awsconfigs/apps/pipeline/kustomization.yaml | 1 + .../s3/disable-minio-server-resources.yaml | 20 +++++++ .../apps/pipeline/s3/kustomization.yaml | 1 + .../Deployment/minio-kubeflow-Deployment.yaml | 52 ------------------- ...io-pvc-kubeflow-PersistentVolumeClaim.yaml | 13 ----- .../minio-service-kubeflow-Service.yaml | 16 ------ .../Deployment/minio-kubeflow-Deployment.yaml | 52 ------------------- ...io-pvc-kubeflow-PersistentVolumeClaim.yaml | 13 ----- .../minio-service-kubeflow-Service.yaml | 16 ------ 9 files changed, 22 insertions(+), 162 deletions(-) create mode 100644 awsconfigs/apps/pipeline/s3/disable-minio-server-resources.yaml delete mode 100644 charts/apps/kubeflow-pipelines/rds-s3/templates/Deployment/minio-kubeflow-Deployment.yaml delete mode 100644 charts/apps/kubeflow-pipelines/rds-s3/templates/PersistentVolumeClaim/minio-pvc-kubeflow-PersistentVolumeClaim.yaml delete mode 100644 charts/apps/kubeflow-pipelines/rds-s3/templates/Service/minio-service-kubeflow-Service.yaml delete mode 100644 charts/apps/kubeflow-pipelines/s3-only/templates/Deployment/minio-kubeflow-Deployment.yaml delete mode 100644 charts/apps/kubeflow-pipelines/s3-only/templates/PersistentVolumeClaim/minio-pvc-kubeflow-PersistentVolumeClaim.yaml delete mode 100644 charts/apps/kubeflow-pipelines/s3-only/templates/Service/minio-service-kubeflow-Service.yaml diff --git a/awsconfigs/apps/pipeline/kustomization.yaml b/awsconfigs/apps/pipeline/kustomization.yaml index 8df30742d4..f780be055f 100644 --- a/awsconfigs/apps/pipeline/kustomization.yaml +++ b/awsconfigs/apps/pipeline/kustomization.yaml @@ -27,6 +27,7 @@ generatorOptions: patchesStrategicMerge: - ./rds/disable-mysql-pv-claim.yaml - ./rds/disable-default-secret.yaml +- ./s3/disable-minio-server-resources.yaml - ./s3/deployment_patch.yaml - ./s3/disable-default-secret.yaml - ./s3/aws-configuration-patch.yaml diff --git a/awsconfigs/apps/pipeline/s3/disable-minio-server-resources.yaml b/awsconfigs/apps/pipeline/s3/disable-minio-server-resources.yaml new file mode 100644 index 0000000000..5563083614 --- /dev/null +++ b/awsconfigs/apps/pipeline/s3/disable-minio-server-resources.yaml @@ -0,0 +1,20 @@ +$patch: delete +apiVersion: apps/v1 +kind: Deployment +metadata: + name: minio + namespace: kubeflow +--- +$patch: delete +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: minio-pvc + namespace: kubeflow +--- +$patch: delete +apiVersion: v1 +kind: Service +metadata: + name: minio-service + namespace: kubeflow diff --git a/awsconfigs/apps/pipeline/s3/kustomization.yaml b/awsconfigs/apps/pipeline/s3/kustomization.yaml index 8f3a745d91..9aa678851a 100644 --- a/awsconfigs/apps/pipeline/s3/kustomization.yaml +++ b/awsconfigs/apps/pipeline/s3/kustomization.yaml @@ -22,6 +22,7 @@ configMapGenerator: generatorOptions: disableNameSuffixHash: true patchesStrategicMerge: +- disable-minio-server-resources.yaml - deployment_patch.yaml - disable-default-secret.yaml - aws-configuration-patch.yaml diff --git a/charts/apps/kubeflow-pipelines/rds-s3/templates/Deployment/minio-kubeflow-Deployment.yaml b/charts/apps/kubeflow-pipelines/rds-s3/templates/Deployment/minio-kubeflow-Deployment.yaml deleted file mode 100644 index a75d687e81..0000000000 --- a/charts/apps/kubeflow-pipelines/rds-s3/templates/Deployment/minio-kubeflow-Deployment.yaml +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: minio - application-crd-id: kubeflow-pipelines - name: minio - namespace: kubeflow -spec: - selector: - matchLabels: - app: minio - application-crd-id: kubeflow-pipelines - strategy: - type: Recreate - template: - metadata: - labels: - app: minio - application-crd-id: kubeflow-pipelines - spec: - containers: - - args: - - server - - /data - env: - - name: MINIO_ACCESS_KEY - valueFrom: - secretKeyRef: - key: accesskey - name: mlpipeline-minio-artifact - - name: MINIO_SECRET_KEY - valueFrom: - secretKeyRef: - key: secretkey - name: mlpipeline-minio-artifact - image: gcr.io/ml-pipeline/minio:RELEASE.2019-08-14T20-37-41Z-license-compliance - name: minio - ports: - - containerPort: 9000 - resources: - requests: - cpu: 20m - memory: 100Mi - volumeMounts: - - mountPath: /data - name: data - subPath: minio - volumes: - - name: data - persistentVolumeClaim: - claimName: minio-pvc diff --git a/charts/apps/kubeflow-pipelines/rds-s3/templates/PersistentVolumeClaim/minio-pvc-kubeflow-PersistentVolumeClaim.yaml b/charts/apps/kubeflow-pipelines/rds-s3/templates/PersistentVolumeClaim/minio-pvc-kubeflow-PersistentVolumeClaim.yaml deleted file mode 100644 index 7d82b465af..0000000000 --- a/charts/apps/kubeflow-pipelines/rds-s3/templates/PersistentVolumeClaim/minio-pvc-kubeflow-PersistentVolumeClaim.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - labels: - application-crd-id: kubeflow-pipelines - name: minio-pvc - namespace: kubeflow -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 20Gi diff --git a/charts/apps/kubeflow-pipelines/rds-s3/templates/Service/minio-service-kubeflow-Service.yaml b/charts/apps/kubeflow-pipelines/rds-s3/templates/Service/minio-service-kubeflow-Service.yaml deleted file mode 100644 index 028fba5702..0000000000 --- a/charts/apps/kubeflow-pipelines/rds-s3/templates/Service/minio-service-kubeflow-Service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - application-crd-id: kubeflow-pipelines - name: minio-service - namespace: kubeflow -spec: - ports: - - name: http - port: 9000 - protocol: TCP - targetPort: 9000 - selector: - app: minio - application-crd-id: kubeflow-pipelines diff --git a/charts/apps/kubeflow-pipelines/s3-only/templates/Deployment/minio-kubeflow-Deployment.yaml b/charts/apps/kubeflow-pipelines/s3-only/templates/Deployment/minio-kubeflow-Deployment.yaml deleted file mode 100644 index a75d687e81..0000000000 --- a/charts/apps/kubeflow-pipelines/s3-only/templates/Deployment/minio-kubeflow-Deployment.yaml +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: minio - application-crd-id: kubeflow-pipelines - name: minio - namespace: kubeflow -spec: - selector: - matchLabels: - app: minio - application-crd-id: kubeflow-pipelines - strategy: - type: Recreate - template: - metadata: - labels: - app: minio - application-crd-id: kubeflow-pipelines - spec: - containers: - - args: - - server - - /data - env: - - name: MINIO_ACCESS_KEY - valueFrom: - secretKeyRef: - key: accesskey - name: mlpipeline-minio-artifact - - name: MINIO_SECRET_KEY - valueFrom: - secretKeyRef: - key: secretkey - name: mlpipeline-minio-artifact - image: gcr.io/ml-pipeline/minio:RELEASE.2019-08-14T20-37-41Z-license-compliance - name: minio - ports: - - containerPort: 9000 - resources: - requests: - cpu: 20m - memory: 100Mi - volumeMounts: - - mountPath: /data - name: data - subPath: minio - volumes: - - name: data - persistentVolumeClaim: - claimName: minio-pvc diff --git a/charts/apps/kubeflow-pipelines/s3-only/templates/PersistentVolumeClaim/minio-pvc-kubeflow-PersistentVolumeClaim.yaml b/charts/apps/kubeflow-pipelines/s3-only/templates/PersistentVolumeClaim/minio-pvc-kubeflow-PersistentVolumeClaim.yaml deleted file mode 100644 index 7d82b465af..0000000000 --- a/charts/apps/kubeflow-pipelines/s3-only/templates/PersistentVolumeClaim/minio-pvc-kubeflow-PersistentVolumeClaim.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - labels: - application-crd-id: kubeflow-pipelines - name: minio-pvc - namespace: kubeflow -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 20Gi diff --git a/charts/apps/kubeflow-pipelines/s3-only/templates/Service/minio-service-kubeflow-Service.yaml b/charts/apps/kubeflow-pipelines/s3-only/templates/Service/minio-service-kubeflow-Service.yaml deleted file mode 100644 index 028fba5702..0000000000 --- a/charts/apps/kubeflow-pipelines/s3-only/templates/Service/minio-service-kubeflow-Service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - application-crd-id: kubeflow-pipelines - name: minio-service - namespace: kubeflow -spec: - ports: - - name: http - port: 9000 - protocol: TCP - targetPort: 9000 - selector: - app: minio - application-crd-id: kubeflow-pipelines