Cherry-pick bug fixes to 1.5 release (#373)

**Description of your changes:** Cherry-pick bug fixes to 1.5 release * Fix for RDS-S3 test: https://github.com/awslabs/kubeflow-manifests/pull/341/files * Fix the S3 only deployment: #310 * Fix S3 bucket name substitution: #333 * Fix insecure connection to S3 - #244 **Testing:** - e2e tests WIP By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. Co-authored-by: jsitu777 <[email protected]> Co-authored-by: jsitu <[email protected]> Co-authored-by: rrrkharse <[email protected]>
awslabs · Sep 17, 2022 · dac4b4e · dac4b4e
1 parent 3b12692
commit dac4b4e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 29 deletions.
diff --git a/awsconfigs/apps/pipeline/kustomization.yaml b/awsconfigs/apps/pipeline/kustomization.yaml
@@ -30,3 +30,12 @@ patchesStrategicMerge:
 # when application is deleted.
 commonLabels:
   application-crd-id: kubeflow-pipelines
+vars:
+- name: kfp-artifact-storage-endpoint
+  objref:
+    kind: ConfigMap
+    name: pipeline-install-config
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.minioServiceHost
+
diff --git a/awsconfigs/apps/pipeline/s3/config b/awsconfigs/apps/pipeline/s3/config
@@ -5,7 +5,7 @@ artifactRepository:
         bucket: $(kfp-artifact-bucket-name),
         keyPrefix: artifacts,
         endpoint: $(kfp-artifact-storage-endpoint),
-        insecure: true,
+        insecure: false,
         accessKeySecret: {
             name: mlpipeline-minio-artifact,
             key: accesskey

diff --git a/awsconfigs/apps/pipeline/s3/disable-mysql-pv-claim.yaml b/awsconfigs/apps/pipeline/s3/disable-mysql-pv-claim.yaml
diff --git a/awsconfigs/apps/pipeline/s3/kustomization.yaml b/awsconfigs/apps/pipeline/s3/kustomization.yaml
@@ -19,7 +19,6 @@ generatorOptions:
   disableNameSuffixHash: true
 patchesStrategicMerge:
 - disable-default-secret.yaml
-- disable-mysql-pv-claim.yaml
 - aws-configuration-patch.yaml
 # Identifier for application manager to apply ownerReference.
 # The ownerReference ensures the resources get garbage collected

diff --git a/tests/e2e/resources/cloudformation-templates/rds-s3.yaml b/tests/e2e/resources/cloudformation-templates/rds-s3.yaml
@@ -103,7 +103,7 @@ Resources:
       DBInstanceClass:
         Ref: DBClass
       Engine: MySQL
-      EngineVersion: "8.0.17"
+      EngineVersion: "8.0.28"
       MultiAZ:
         Ref: MultiAZ
       MasterUsername: