feat: update kubeflow chart

Author: TheCodingSheikh

charts/kubeflow/Chart.yaml

@@ -5,7 +5,7 @@ description: >
   preconfigured according to the upstream examples/kustomization.yaml structure.
 
 type: application
-version: 1.0.1
+version: 1.0.2
 appVersion: "1.10.0"
 
 home: https://github.com/TheCodingSheikh/helm-charts/tree/main/charts/kubeflow
@@ -19,8 +19,3 @@ keywords:
   - helm
   - gitops
   - machine-learning
-
-dependencies:
-  - name: raw
-    version: 1.0.1
-    repository: https://thecodingsheikh.github.io/helm-charts

charts/kubeflow/README.md

@@ -41,14 +41,18 @@ kubeflowManifestsRepo: https://github.com/kubeflow/manifests
 # Git branch to use
 kubeflowManifestsRepoBranch: HEAD
 
+# Argo app specs
+defaultAppSpec: {}
+
 # All resources you want to deploy
 resources:
-  <componentName>: < this will be the argo app name converted to [kebabcase](https://helm.sh/docs/chart_template_guide/function_list/#kebabcase)
+  <componentName>: < this will be the argo app name converted to [kebabcase](https://helm.sh/docs/chart_template_guide/function_list/#kebabcase) and prepended by "kubeflow-"
     enabled: true | false (required)
     path: <path/in/repo> (required)
     appNameOverride: custom argo app name (optional)
     repoOverride: custom repo source (optional - defaults to `kubeflowManifestsRepo`)
     repoBranchOverride: custom repo branch (optional - defaults to `kubeflowManifestsRepoBranch`)
+    appSpecOverride: custom argo app specs (optional - defaults to `defaultAppSpec`)
     labels: argo app labels (optional)
     annotations: argo app annotations (optional)
     kustomize: [kustomize config for argo app](https://argo-cd.readthedocs.io/en/latest/user-guide/kustomize/#patches) (optional)
@@ -69,6 +73,27 @@ argoNamespace: argocd
 destinationServer: https://kubernetes.default.svc
 kubeflowManifestsRepo: https://github.com/kubeflow/manifests
 kubeflowManifestsRepoBranch: HEAD
+defaultAppSpec:
+  ignoreDifferences:
+  - group: argoproj.io
+    jsonPointers:
+    - /status
+    kind: Application
+  syncPolicy:
+    automated:
+      allowEmpty: true
+      prune: true
+      selfHeal: true
+    retry:
+      backoff:
+        duration: 20s
+        factor: 3
+        maxDuration: 20s
+      limit: 30
+    syncOptions:
+    - ApplyOutOfSyncOnly=true
+    - ServerSideApply=true
+    - CreateNamespace=true
 
 resources:
   certManagerBase:
@@ -107,19 +132,19 @@ resources:
     enabled: true
     path: common/istio-1-24/cluster-local-gateway/base
 
-  kubeflowNamespace:
+  namespace:
     enabled: true
     path: common/kubeflow-namespace/base
 
   networkPolicies:
     enabled: true
     path: common/networkpolicies/base
 
-  kubeflowRoles:
+  roles:
     enabled: true
     path: common/kubeflow-roles/base
 
-  kubeflowIstioResources:
+  istioResources:
     enabled: true
     path: common/istio-1-24/kubeflow-istio-resources/base
 

charts/kubeflow/templates/application.yaml

@@ -6,7 +6,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: {{ default $config.appNameOverride (kebabcase $app) }}
+  name: kubeflow-{{ default $config.appNameOverride (kebabcase $app) }}
   namespace: {{ $root.Values.argoNamespace }}
   {{- if $config.labels }}
   labels: 
@@ -30,25 +30,7 @@ spec:
   destination:
     server: {{ $root.Values.destinationServer }}
     namespace: {{ $root.Values.argoNamespace }}
-  ignoreDifferences:
-  - group: argoproj.io
-    jsonPointers:
-    - /status
-    kind: Application
-  syncPolicy:
-    automated:
-      allowEmpty: true
-      prune: true
-      selfHeal: true
-    retry:
-      backoff:
-        duration: 1m
-        factor: 2
-        maxDuration: 16m
-      limit: 10
-    syncOptions:
-    - ApplyOutOfSyncOnly=true
-    - ServerSideApply=true
+{{ toYaml (default $root.Values.defaultAppSpec $config.appSpecOverride) | indent 2 }}
     {{- end }}
   {{- end }}
 {{- end }}

charts/kubeflow/templates/raw.yaml

@@ -0,0 +1,23 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: kubeflow-raw
+  namespace: {{ .Values.argoNamespace }}
+{{- $annotations := .Values.commonAppAnnotations }}
+{{- if $annotations }}
+  annotations:
+{{ toYaml $annotations | indent 4 }}
+{{- end }}
+spec:
+  project: {{ .Values.argoProjectName }}
+  source:
+    repoURL: https://thecodingsheikh.github.io/helm-charts
+    targetRevision: 1.0.1
+    chart: raw
+    helm:
+      values: | 
+{{ toYaml .Values.raw | indent 8 }}
+  destination:
+    server: {{ .Values.destinationServer }}
+    namespace: {{ .Values.argoNamespace }}
+{{ toYaml .Values.defaultAppSpec | indent 2 }}

charts/kubeflow/values.yaml

@@ -4,6 +4,27 @@ commonAppAnnotations: {}
 destinationServer: https://kubernetes.default.svc
 kubeflowManifestsRepo: https://github.com/kubeflow/manifests
 kubeflowManifestsRepoBranch: HEAD
+defaultAppSpec:
+  ignoreDifferences:
+  - group: argoproj.io
+    jsonPointers:
+    - /status
+    kind: Application
+  syncPolicy:
+    automated:
+      allowEmpty: true
+      prune: true
+      selfHeal: true
+    retry:
+      backoff:
+        duration: 20s
+        factor: 3
+        maxDuration: 20s
+      limit: 30
+    syncOptions:
+    - ApplyOutOfSyncOnly=true
+    - ServerSideApply=true
+    - CreateNamespace=true
 
 resources:
   certManagerBase:
@@ -42,19 +63,19 @@ resources:
     enabled: true
     path: common/istio-1-24/cluster-local-gateway/base
 
-  kubeflowNamespace:
+  namespace:
     enabled: true
     path: common/kubeflow-namespace/base
 
   networkPolicies:
     enabled: true
     path: common/networkpolicies/base
 
-  kubeflowRoles:
+  roles:
     enabled: true
     path: common/kubeflow-roles/base
 
-  kubeflowIstioResources:
+  istioResources:
     enabled: true
     path: common/istio-1-24/kubeflow-istio-resources/base
 
@@ -119,4 +140,4 @@ resources:
     path: apps/kserve/models-web-app/overlays/kubeflow
 
 raw:
-  resources: {}
+  resources: {}