value passthrough for EKS

alex-treebeard · alex-treebeard · commit 8fef0704c41b · 2024-03-08T10:53:28.000Z
diff --git a/examples/eks-https-loadbalancer/charts/issuer/templates/cert.yaml b/examples/eks-https-loadbalancer/charts/issuer/templates/cert.yaml
@@ -0,0 +1,12 @@
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: gateway-cert
+spec:
+  commonName: '{{ .Values.hostname }}'
+  dnsNames:
+    - '{{ .Values.hostname }}'
+  issuerRef:
+    kind: Issuer
+    name: treebeard-issuer
+  secretName: gateway-cert
diff --git a/examples/eks-https-loadbalancer/charts/issuer/templates/issuer.yaml b/examples/eks-https-loadbalancer/charts/issuer/templates/issuer.yaml
@@ -3,8 +3,6 @@ kind: Issuer
 metadata:
   name: treebeard-issuer
 spec:
-  # selfSigned: {}
-
   acme:
     email: {{ .Values.certEmailOwner | required "Please provide a valid email address" }}
     preferredChain: ''
diff --git a/examples/eks-https-loadbalancer/istio.tf b/examples/eks-https-loadbalancer/istio.tf
@@ -22,6 +22,7 @@ resource "helm_release" "issuer" {
     <<EOF
     certEmailOwner: ${var.cert_email_owner}
     hostedZoneId: ${var.hosted_zone_id}
+    hostname: ${var.host}
     EOF
   ]
   depends_on = [
diff --git a/examples/eks-https-loadbalancer/kubeflow.tf b/examples/eks-https-loadbalancer/kubeflow.tf
@@ -1,13 +1,37 @@
 module "treebeardkf" {
   count                  = var.enable_treebeardkf ? 1 : 0
   source                 = "../.."
-  hostname               = var.host
-  enable_https           = true
-  issuer_name            = "treebeard-issuer"
-  enable_istio_base      = false
-  enable_istiod          = false
-  enable_istio_resources = true
-  enable_cert_manager    = false
+  kubeflow_values = [
+    <<EOF
+certManager:
+  enabled: false
+istioBase:
+  enabled: false
+istiod:
+  enabled: false
+istioResources:
+  spec:
+    source:
+      kustomize:
+        patches:
+        - target:
+            kind: Gateway
+            name: kubeflow-gateway
+          patch: |-
+            - op: replace
+              path: /spec/servers/0
+              value:
+                hosts:
+                - ${var.host}
+                port:
+                  name: https
+                  number: 443
+                  protocol: HTTPS
+                tls:
+                  credentialName: gateway-cert
+                  mode: SIMPLE
+EOF
+  ]
   depends_on = [
     null_resource.cluster_ready,
     null_resource.core_addons,
diff --git a/examples/k3s-existing-istio/main.tf b/examples/k3s-existing-istio/main.tf
@@ -110,6 +110,27 @@ istioBase:
   enabled: false
 istiod:
   enabled: false
+# istioResources:
+#   spec:
+#     source:
+#       kustomize:
+#         patches:
+#         - target:
+#             kind: Gateway
+#             name: kubeflow-gateway
+#           patch: |-
+#             - op: replace
+#               path: /spec/servers/0
+#               value:
+#                 hosts:
+#                 - kf.example.com
+#                 port:
+#                   name: https
+#                   number: 443
+#                   protocol: HTTPS
+#                 tls:
+#                   credentialName: gateway-cert
+#                   mode: SIMPLE
 EOF
   ]
   depends_on = [
diff --git a/helm/kubeflow-argo-apps/templates/010-developer-gateway/006-istio-gateway.yaml b/helm/kubeflow-argo-apps/templates/010-developer-gateway/006-istio-gateway.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.gateway.enabled }}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -7,4 +8,5 @@ metadata:
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
-{{ .Values.gatewaySpec | toYaml | indent 2}}
+{{ .Values.gateway.spec | toYaml | indent 2 }}
+{{- end -}}
diff --git a/helm/kubeflow-argo-apps/templates/010-developer-gateway/008-dex.yaml b/helm/kubeflow-argo-apps/templates/010-developer-gateway/008-dex.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.dex.enabled }}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -7,4 +8,5 @@ metadata:
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
-{{ .Values.dexSpec | toYaml | indent 2}}
+{{ .Values.dex.spec | toYaml | indent 2 }}
+{{- end -}}
diff --git a/helm/kubeflow-argo-apps/templates/010-developer-gateway/009-kubeflow-namespace.yaml b/helm/kubeflow-argo-apps/templates/010-developer-gateway/009-kubeflow-namespace.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.kubeflowNamespace.enabled }}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -7,4 +8,5 @@ metadata:
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
-{{ .Values.kubeflowNamespaceSpec | toYaml | indent 2}}
+{{ .Values.kubeflowNamespace.spec | toYaml | indent 2 }}
+{{- end -}}
diff --git a/helm/kubeflow-argo-apps/templates/010-developer-gateway/009-oidc-authservice.yaml b/helm/kubeflow-argo-apps/templates/010-developer-gateway/009-oidc-authservice.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.oidcAuthService.enabled -}}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -7,4 +8,5 @@ metadata:
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
-{{ .Values.oidcAuthServiceSpec | toYaml | indent 2}}
+{{ .Values.oidcAuthService.spec | toYaml | indent 2 }}
+{{- end -}}
diff --git a/helm/kubeflow-argo-apps/templates/010-developer-gateway/010-istio-resources.yaml b/helm/kubeflow-argo-apps/templates/010-developer-gateway/010-istio-resources.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.istioResources.enabled }}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -7,4 +8,5 @@ metadata:
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
-{{ .Values.istioResourcesSpec | toYaml | indent 2}}
+{{ .Values.istioResources.spec | toYaml | indent 2 }}
+{{- end -}}
diff --git a/helm/kubeflow-argo-apps/templates/010-developer-gateway/010-kubeflow-roles.yaml b/helm/kubeflow-argo-apps/templates/010-developer-gateway/010-kubeflow-roles.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.kubeflowRoles.enabled }}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -7,4 +8,5 @@ metadata:
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
-{{ .Values.kubeflowRolesSpec | toYaml | indent 2}}
+{{ .Values.kubeflowRoles.spec | toYaml | indent 2 }}
+{{- end -}}
diff --git a/helm/kubeflow-argo-apps/templates/100-kubeflow-notebooks/100-admission-webhook.yaml b/helm/kubeflow-argo-apps/templates/100-kubeflow-notebooks/100-admission-webhook.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.admissionWebhook.enabled }}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -7,4 +8,5 @@ metadata:
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
-{{ .Values.admissionWebhookSpec | toYaml | indent 2}}
+{{ .Values.admissionWebhook.spec | toYaml | indent 2 }}
+{{- end -}}
diff --git a/helm/kubeflow-argo-apps/templates/100-kubeflow-notebooks/100-central-dashboard.yaml b/helm/kubeflow-argo-apps/templates/100-kubeflow-notebooks/100-central-dashboard.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.centralDashboard.enabled -}}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -7,4 +8,5 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "100"
 spec:
-{{ .Values.centralDashboardSpec | toYaml | indent 2 }}
+{{ .Values.centralDashboard.spec | toYaml | indent 2 }}
+{{- end -}}
diff --git a/helm/kubeflow-argo-apps/templates/100-kubeflow-notebooks/100-jupyter-web-app.yaml b/helm/kubeflow-argo-apps/templates/100-kubeflow-notebooks/100-jupyter-web-app.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.jupyterWebApp.enabled }}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -7,4 +8,5 @@ metadata:
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
-{{ .Values.jupyterWebAppSpec | toYaml | indent 2}}
+{{ .Values.jupyterWebApp.spec | toYaml | indent 2 }}
+{{- end -}}
diff --git a/helm/kubeflow-argo-apps/templates/100-kubeflow-notebooks/100-notebook-controller.yaml b/helm/kubeflow-argo-apps/templates/100-kubeflow-notebooks/100-notebook-controller.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.notebookController.enabled }}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -7,4 +8,5 @@ metadata:
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
-{{ .Values.notebookControllerSpec | toYaml | indent 2}}
+{{ .Values.notebookController.spec | toYaml | indent 2 }}
+{{- end -}}
diff --git a/helm/kubeflow-argo-apps/templates/100-kubeflow-notebooks/100-profiles.yaml b/helm/kubeflow-argo-apps/templates/100-kubeflow-notebooks/100-profiles.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.profiles.enabled }}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -7,4 +8,5 @@ metadata:
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
-{{ .Values.profilesSpec | toYaml | indent 2}}
+{{ .Values.profiles.spec | toYaml | indent 2 }}
+{{- end -}}
diff --git a/helm/kubeflow-argo-apps/templates/100-kubeflow-notebooks/100-pvcviewer-controller.yaml b/helm/kubeflow-argo-apps/templates/100-kubeflow-notebooks/100-pvcviewer-controller.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.pvcViewerController.enabled }}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -7,4 +8,5 @@ metadata:
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
-{{ .Values.pvcViewerControllerSpec | toYaml | indent 2  }}
+{{ .Values.pvcViewerController.spec | toYaml | indent 2 }}
+{{- end -}}
diff --git a/helm/kubeflow-argo-apps/templates/100-kubeflow-notebooks/100-volumes-web-app.yaml b/helm/kubeflow-argo-apps/templates/100-kubeflow-notebooks/100-volumes-web-app.yaml
@@ -8,5 +8,5 @@ metadata:
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
-{{ .Values.volumesWebApp.spec | toYaml | indent 2}}
+{{ .Values.volumesWebApp.spec | toYaml | indent 2 }}
 {{ end }}
diff --git a/helm/kubeflow-argo-apps/values.yaml b/helm/kubeflow-argo-apps/values.yaml
diff --git a/main.tf b/main.tf

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ resource "helm_release" "issuer" {`
`22`	`22`	`<<EOF`
`23`	`23`	`certEmailOwner: ${var.cert_email_owner}`
`24`	`24`	`hostedZoneId: ${var.hosted_zone_id}`
	`25`	`+ hostname: ${var.host}`
`25`	`26`	`EOF`
`26`	`27`	`]`
`27`	`28`	`depends_on = [`