wip/tbd: test with branch 30-update-quickstart-scripts

kromanow94 · May 4, 2024 · 457608a · 457608a
1 parent 7e977cd
commit 457608a
Show file tree

Hide file tree

Showing 21 changed files with 66 additions and 42 deletions.
diff --git a/example/helm/app.app-of-apps.yaml b/example/helm/app.app-of-apps.yaml
@@ -11,7 +11,7 @@ spec:
   project: default
   source:
     repoURL: https://github.com/kromanow94/kubeflow-manifests.git
-    targetRevision: helmcharts
+    targetRevision: 30-update-quickstart-scripts
     path: example/helm
     directory:
       include: "app.*"

diff --git a/example/helm/app.argo-workflows.yaml b/example/helm/app.argo-workflows.yaml
@@ -20,7 +20,7 @@ spec:
         valueFiles:
           - $values/example/helm/values.argo-workflows.yaml
     - repoURL: https://github.com/kromanow94/kubeflow-manifests.git
-      targetRevision: helmcharts
+      targetRevision: 30-update-quickstart-scripts
       ref: values
   syncPolicy:
     automated:

diff --git a/example/helm/app.cert-manager.yaml b/example/helm/app.cert-manager.yaml
@@ -6,22 +6,22 @@ metadata:
   name: cert-manager
   namespace: argocd
   finalizers:
-  - resources-finalizer.argocd.argoproj.io
+    - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
     namespace: cert-manager
     server: https://kubernetes.default.svc
   project: default
   sources:
-  - chart: cert-manager
-    repoURL: https://charts.jetstack.io
-    targetRevision: v1.14.3
-    helm:
-      valueFiles:
-      - $values/example/helm/values.cert-manager.yaml
-  - repoURL: https://github.com/kromanow94/kubeflow-manifests.git
-    targetRevision: helmcharts
-    ref: values
+    - chart: cert-manager
+      repoURL: https://charts.jetstack.io
+      targetRevision: v1.14.3
+      helm:
+        valueFiles:
+          - $values/example/helm/values.cert-manager.yaml
+    - repoURL: https://github.com/kromanow94/kubeflow-manifests.git
+      targetRevision: 30-update-quickstart-scripts
+      ref: values
   syncPolicy:
     automated:
       prune: true
@@ -33,4 +33,4 @@ spec:
         maxDuration: 10m
       limit: 5
     syncOptions:
-    - CreateNamespace=true
+      - CreateNamespace=true
diff --git a/example/helm/app.dex.yaml b/example/helm/app.dex.yaml
@@ -20,7 +20,7 @@ spec:
         valueFiles:
           - $values/example/helm/values.dex.yaml
     - repoURL: https://github.com/kromanow94/kubeflow-manifests.git
-      targetRevision: helmcharts
+      targetRevision: 30-update-quickstart-scripts
       ref: values
   syncPolicy:
     automated:

diff --git a/example/helm/app.istio-ingressgateway.yaml b/example/helm/app.istio-ingressgateway.yaml
@@ -20,7 +20,7 @@ spec:
         valueFiles:
           - $values/example/helm/values.istio-ingressgateway.yaml
     - repoURL: https://github.com/kromanow94/kubeflow-manifests.git
-      targetRevision: helmcharts
+      targetRevision: 30-update-quickstart-scripts
       ref: values
   syncPolicy:
     automated:

diff --git a/example/helm/app.istiod.yaml b/example/helm/app.istiod.yaml
@@ -20,7 +20,7 @@ spec:
         valueFiles:
           - $values/example/helm/values.istiod.yaml
     - repoURL: https://github.com/kromanow94/kubeflow-manifests.git
-      targetRevision: helmcharts
+      targetRevision: 30-update-quickstart-scripts
       ref: values
   syncPolicy:
     automated:

diff --git a/example/helm/app.kubeflow-secrets.yaml b/example/helm/app.kubeflow-secrets.yaml
@@ -13,7 +13,7 @@ spec:
   project: default
   source:
     repoURL: https://github.com/kromanow94/kubeflow-manifests.git
-    targetRevision: helmcharts
+    targetRevision: 30-update-quickstart-scripts
     path: example/helm
     directory:
       include: "secret.*"

diff --git a/example/helm/app.kubeflow.yaml b/example/helm/app.kubeflow.yaml
@@ -12,10 +12,16 @@ spec:
     namespace: kubeflow
     server: https://kubernetes.default.svc
   project: default
-  source:
-    repoURL: https://github.com/kromanow94/kubeflow-manifests.git
-    targetRevision: helmcharts
-    path: charts/kubeflow
+  sources:
+    - repoURL: https://github.com/kromanow94/kubeflow-manifests.git
+      targetRevision: 30-update-quickstart-scripts
+      path: charts/kubeflow
+      helm:
+        valueFiles:
+          - $values/example/helm/values.kubeflow.yaml
+    - repoURL: https://github.com/kromanow94/kubeflow-manifests.git
+      targetRevision: 30-update-quickstart-scripts
+      ref: values
   ignoreDifferences:
     - group: rbac.authorization.k8s.io
       kind: ClusterRole

diff --git a/example/helm/app.metacontroller.yaml b/example/helm/app.metacontroller.yaml
@@ -20,7 +20,7 @@ spec:
         valueFiles:
           - $values/example/helm/values.metacontroller.yaml
     - repoURL: https://github.com/kromanow94/kubeflow-manifests.git
-      targetRevision: helmcharts
+      targetRevision: 30-update-quickstart-scripts
       ref: values
   syncPolicy:
     automated:

diff --git a/example/helm/app.minio.yaml b/example/helm/app.minio.yaml
@@ -20,7 +20,7 @@ spec:
         valueFiles:
           - $values/example/helm/values.minio.yaml
     - repoURL: https://github.com/kromanow94/kubeflow-manifests.git
-      targetRevision: helmcharts
+      targetRevision: 30-update-quickstart-scripts
       ref: values
   syncPolicy:
     automated:

diff --git a/example/helm/app.mysql.yaml b/example/helm/app.mysql.yaml
@@ -20,7 +20,7 @@ spec:
         valueFiles:
           - $values/example/helm/values.mysql.yaml
     - repoURL: https://github.com/kromanow94/kubeflow-manifests.git
-      targetRevision: helmcharts
+      targetRevision: 30-update-quickstart-scripts
       ref: values
   syncPolicy:
     automated:

diff --git a/example/helm/app.oauth2-proxy.yaml b/example/helm/app.oauth2-proxy.yaml
@@ -20,7 +20,7 @@ spec:
         valueFiles:
           - $values/example/helm/values.oauth2-proxy.yaml
     - repoURL: https://github.com/kromanow94/kubeflow-manifests.git
-      targetRevision: helmcharts
+      targetRevision: 30-update-quickstart-scripts
       ref: values
   syncPolicy:
     automated:

diff --git a/example/helm/app.profile-kubeflow-user-example-com.yaml b/example/helm/app.profile-kubeflow-user-example-com.yaml
@@ -13,7 +13,7 @@ spec:
   project: default
   source:
     repoURL: https://github.com/kromanow94/kubeflow-manifests.git
-    targetRevision: helmcharts
+    targetRevision: 30-update-quickstart-scripts
     path: example/helm
     directory:
       include: profile.kubeflow-user-example-com.yaml

diff --git a/example/helm/quickstart.app-of-apps.sh b/example/helm/quickstart.app-of-apps.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-TARGET_REVISION="${TARGET_REVISION:-helmcharts}"
+TARGET_REVISION="${TARGET_REVISION:-30-update-quickstart-scripts}"
 
 cat <<EOF
 This script will install ArgoCD, configure it to enable health assessment

diff --git a/example/helm/quickstart.argocd.sh b/example/helm/quickstart.argocd.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-TARGET_REVISION="${TARGET_REVISION:-helmcharts}"
+TARGET_REVISION="${TARGET_REVISION:-30-update-quickstart-scripts}"
 
 cat <<EOF
 This script will check if ArgoCD is installed, install ArgoCD if not installed
@@ -35,7 +35,6 @@ kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests
 kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.istio-base.yaml
 kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.istiod.yaml
 kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.metacontroller.yaml
-kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.argo-workflows.yaml
 set +x
 
 # Wait until pods are created. This is not required since ArgoCD will be
@@ -45,6 +44,7 @@ sleep 30
 kubectl wait pods --all -n kubeflow --for=condition=Ready --timeout 300s
 
 set -x
+kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.argo-workflows.yaml
 kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.istio-ingressgateway.yaml
 kubectl apply -f https://raw.githubusercontent.com/kromanow94/kubeflow-manifests/${TARGET_REVISION}/example/helm/app.kubeflow.yaml
 set +x

diff --git a/example/helm/quickstart.helm.sh b/example/helm/quickstart.helm.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-TARGET_REVISION="${TARGET_REVISION:-helmcharts}"
+TARGET_REVISION="${TARGET_REVISION:-30-update-quickstart-scripts}"
 
 cat <<EOF
 This script will create 'kubeflow' namespace configured with istio injection and

diff --git a/example/helm/values.argo-workflows.yaml b/example/helm/values.argo-workflows.yaml
@@ -14,18 +14,13 @@ controller:
       database: argo
       host: mysql
       port: 3306
-      passwordSecret:
-        # this is created by Kubeflow
-        key: password
-        name: mysql-secret
-
-        # this is created by mysql Helm Chart
-        # key: mysql-root-password
-        # name: mysql
       tableName: argo_workflows
+      passwordSecret:
+        name: db-credentials
+        key: mysql-root-password
       userNameSecret:
+        name: db-credentials
         key: username
-        name: mysql-secret
     nodeStatusOffLoad: true
 
 server:
@@ -37,11 +32,11 @@ artifactRepository:
   archiveLogs: true
   s3:
     accessKeySecret:
-      key: accesskey
       name: mlpipeline-minio-artifact
+      key: accesskey
     secretKeySecret:
-      key: secretkey
       name: mlpipeline-minio-artifact
+      key: secretkey
     bucket: mlpipeline
     # endpoint: minio-service.kubeflow:9000
     endpoint: minio.kubeflow:9000

diff --git a/example/helm/values.kubeflow.eks.yaml b/example/helm/values.kubeflow.eks.yaml
@@ -3,4 +3,4 @@ istioIntegration:
     inCluster: false
     issuer: https://oidc.eks.<region>.amazonaws.com/id/1234567890
     selfSigned:
-      autoJwksDiscovery: false
+      autoJwksDiscovery: false
diff --git a/example/helm/values.kubeflow.yaml b/example/helm/values.kubeflow.yaml
@@ -0,0 +1,20 @@
+pipelines:
+  config:
+    db:
+      user:
+        secretKeyRef:
+          name: db-credentials
+      password:
+        secretKeyRef:
+          name: db-credentials
+          key: mysql-root-password
+      host:
+        secretKeyRef:
+          name: db-credentials
+    objectStore:
+      accessKey:
+        secretKeyRef:
+          name: mlpipeline-minio-artifact
+      secretAccessKey:
+        secretKeyRef:
+          name: mlpipeline-minio-artifact
diff --git a/example/helm/values.minio.yaml b/example/helm/values.minio.yaml
@@ -1,2 +1,4 @@
 commonLabels:
   sidecar.istio.io/inject: "false"
+auth:
+  existingSecret: mlpipeline-minio-artifact
diff --git a/example/helm/values.mysql.yaml b/example/helm/values.mysql.yaml
@@ -1,5 +1,6 @@
 auth:
   # This will create a new database.
   database: argo
+  existingSecret: db-credentials
 commonLabels:
   sidecar.istio.io/inject: "false"