[CI] Publish truefoundry to version (#872)

* [CI] Publish Truefoundry chart version * Update README.md with readme-generator-for-helm Signed-off-by: innoavator <[email protected]> --------- Signed-off-by: innoavator <[email protected]> Co-authored-by: srihari-tf <[email protected]> Co-authored-by: innoavator <[email protected]>
truefoundry · Dec 16, 2024 · 01f864a · 01f864a
1 parent 3cbca74
commit 01f864a
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 82 deletions.
diff --git a/charts/truefoundry/Chart.yaml b/charts/truefoundry/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: truefoundry
-version: 0.18.1
+version: 0.19.0
 description: "TrueFoundry Control Plane Components"
 maintainers:
   - name: truefoundry

diff --git a/charts/truefoundry/README.md b/charts/truefoundry/README.md
@@ -11,7 +11,7 @@ truefoundry is an applications that gets deployed on the kubernetes cluster to s
 | `global.truefoundryImagePullConfigJSON`         | JSON config for image pull secret                            | `""`                                                                             |
 | `global.tenantName`                             | Name of the tenant                                           | `""`                                                                             |
 | `global.controlPlaneURL`                        | URL of the control plane                                     | `http://truefoundry-truefoundry-frontend-app.truefoundry.svc.cluster.local:5000` |
-| `global.controlPlaneChartVersion`               | Version of control-plane chart                               | `0.18.1`                                                                         |
+| `global.controlPlaneChartVersion`               | Version of control-plane chart                               | `0.19.0`                                                                         |
 | `global.existingTruefoundryCredsSecret`         | Name of the existing truefoundry creds secret                | `""`                                                                             |
 | `global.database.host`                          | Control plane database hostname when dev mode is not enabled | `""`                                                                             |
 | `global.database.name`                          | Control plane database name when dev mode is not enabled     | `""`                                                                             |
@@ -51,7 +51,7 @@ truefoundry is an applications that gets deployed on the kubernetes cluster to s
 | `truefoundryFrontendApp.replicaCount`                         | Number of replicas for the frontend app                | `1`                                                                                        |
 | `truefoundryFrontendApp.global`                               | Global values for the frontend app                     | `{}`                                                                                       |
 | `truefoundryFrontendApp.image.repository`                     | Image repository for the frontend app                  | `tfy.jfrog.io/tfy-private-images/truefoundry-frontend-app`                                 |
-| `truefoundryFrontendApp.image.tag`                            | Image tag for the frontend app                         | `v0.17.0`                                                                                  |
+| `truefoundryFrontendApp.image.tag`                            | Image tag for the frontend app                         | `v0.18.0`                                                                                  |
 | `truefoundryFrontendApp.envSecretName`                        | Secret name for the frontend app environment variables | `truefoundry-frontend-app-env-secret`                                                      |
 | `truefoundryFrontendApp.imagePullPolicy`                      | Image pull policy for the frontend app                 | `IfNotPresent`                                                                             |
 | `truefoundryFrontendApp.nameOverride`                         | Override name for the frontend app                     | `""`                                                                                       |
@@ -137,7 +137,7 @@ truefoundry is an applications that gets deployed on the kubernetes cluster to s
 | `servicefoundryServer.replicaCount`                         | Number of replicas for the servicefoundry server                | `1`                                                     |
 | `servicefoundryServer.global`                               | Global values for the servicefoundry server                     | `{}`                                                    |
 | `servicefoundryServer.image.repository`                     | Image repository for the servicefoundry server                  | `tfy.jfrog.io/tfy-private-images/servicefoundry-server` |
-| `servicefoundryServer.image.tag`                            | Image tag for the servicefoundry server                         | `v0.18.0`                                               |
+| `servicefoundryServer.image.tag`                            | Image tag for the servicefoundry server                         | `v0.19.0`                                               |
 | `servicefoundryServer.environmentName`                      | Environment name for the servicefoundry server                  | `default`                                               |
 | `servicefoundryServer.envSecretName`                        | Secret name for the servicefoundry server environment variables | `servicefoundry-server-env-secret`                      |
 | `servicefoundryServer.imagePullPolicy`                      | Image pull policy for the servicefoundry server                 | `IfNotPresent`                                          |
@@ -178,7 +178,7 @@ truefoundry is an applications that gets deployed on the kubernetes cluster to s
 | `tfyK8sController.replicaCount`                         | Number of replicas for the tfyK8sController                | `1`                                                  |
 | `tfyK8sController.global`                               | Global values for the tfyK8sController                     | `{}`                                                 |
 | `tfyK8sController.image.repository`                     | Image repository for the tfyK8sController                  | `tfy.jfrog.io/tfy-private-images/tfy-k8s-controller` |
-| `tfyK8sController.image.tag`                            | Image tag for the tfyK8sController                         | `v0.15.0`                                            |
+| `tfyK8sController.image.tag`                            | Image tag for the tfyK8sController                         | `v0.16.0`                                            |
 | `tfyK8sController.environmentName`                      | Environment name for tfyK8sController                      | `default`                                            |
 | `tfyK8sController.envSecretName`                        | Secret name for the tfyK8sController environment variables | `tfy-k8s-controller-env-secret`                      |
 | `tfyK8sController.imagePullPolicy`                      | Image pull policy for the tfyK8sController                 | `IfNotPresent`                                       |
@@ -213,7 +213,7 @@ truefoundry is an applications that gets deployed on the kubernetes cluster to s
 | `sfyManifestService.tolerations`                          | Tolerations specific to the sfy manifest service               | `{}`                                                   |
 | `sfyManifestService.global`                               | Global values for the sfy manifest service                     | `{}`                                                   |
 | `sfyManifestService.image.repository`                     | Image repository for the sfy manifest service                  | `tfy.jfrog.io/tfy-private-images/sfy-manifest-service` |
-| `sfyManifestService.image.tag`                            | Image tag for the sfy manifest service                         | `v0.15.0`                                              |
+| `sfyManifestService.image.tag`                            | Image tag for the sfy manifest service                         | `v0.16.0`                                              |
 | `sfyManifestService.replicaCount`                         | Number of replicas for the sfy manifest service                | `1`                                                    |
 | `sfyManifestService.environmentName`                      | Environment name for the sfy manifest service                  | `default`                                              |
 | `sfyManifestService.envSecretName`                        | Secret name for the sfy manifest service environment variables | `sfy-manifest-service-env-secret`                      |

diff --git a/charts/truefoundry/templates/bootstrap/_helpers.tpl b/charts/truefoundry/templates/bootstrap/_helpers.tpl
diff --git a/charts/truefoundry/templates/bootstrap/job.yaml b/charts/truefoundry/templates/bootstrap/job.yaml
@@ -50,8 +50,10 @@ spec:
       {{- toYaml .Values.truefoundryBootstrap.extraVolumes | nindent 6 }}
       {{- end }}
       restartPolicy: Never
+      {{- if .Values.truefoundryBootstrap.nodeSelector }}
       nodeSelector:
-        {{- include "truefoundry-bootstrap.nodeSelector" . | nindent 8 }}
+          {{- toYaml .Values.truefoundryBootstrap.nodeSelector | nindent 8 }}
+        {{- end }}
       {{- $mergedAffinity := dict | merge .Values.truefoundryBootstrap.affinity .Values.global.affinity }}
       {{- if $mergedAffinity }}
       affinity:

diff --git a/charts/truefoundry/templates/mlfoundry-server/_helpers.tpl b/charts/truefoundry/templates/mlfoundry-server/_helpers.tpl
@@ -102,12 +102,3 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 {{- end }}
 {{- end }}
-
-{{/*
-  Merge nodeSelector
-  */}}
-{{- define "mlfoundry-server.nodeSelector" -}}
-{{- $defaultNodeSelector := dict "kubernetes.io/arch" "amd64" }}
-{{- $mergedNodeSelector := merge .Values.mlfoundryServer.nodeSelector $defaultNodeSelector }}
-{{- toYaml $mergedNodeSelector }}
-{{- end }}
diff --git a/charts/truefoundry/templates/mlfoundry-server/deployment.yaml b/charts/truefoundry/templates/mlfoundry-server/deployment.yaml
@@ -68,8 +68,10 @@ spec:
       {{- end }}
       volumes:
       {{- toYaml .Values.mlfoundryServer.extraVolumes | nindent 8 }}
+      {{- if .Values.mlfoundryServer.nodeSelector }}
       nodeSelector:
-        {{- include "mlfoundry-server.nodeSelector" . | nindent 8 }}
+        {{- toYaml .Values.mlfoundryServer.nodeSelector | nindent 8 }}
+      {{- end }}
       {{- $mergedAffinity := dict | merge .Values.mlfoundryServer.affinity .Values.global.affinity }}
       {{- if $mergedAffinity }}
       affinity:

diff --git a/charts/truefoundry/templates/servicefoundry-server/_helpers.tpl b/charts/truefoundry/templates/servicefoundry-server/_helpers.tpl
@@ -206,12 +206,3 @@ GLOBAL_BUILDERS_BUILDKIT_URLS: {{ $urls | trimPrefix ","  }}
 {{- end }}
 {{- $volumeMounts | toYaml -}}
 {{- end -}}
-
-{{/*
-  Merge default nodeSelector with nodeSelector specified in servicefoundry-server nodeSelector
-  */}}
-{{- define "servicefoundry-server.nodeSelector" -}}
-{{- $defaultNodeSelector := dict "kubernetes.io/arch" "amd64" }}
-{{- $mergedNodeSelector := merge .Values.servicefoundryServer.nodeSelector $defaultNodeSelector }}
-{{- toYaml $mergedNodeSelector }}
-{{- end }}
diff --git a/charts/truefoundry/templates/servicefoundry-server/deployment.yaml b/charts/truefoundry/templates/servicefoundry-server/deployment.yaml
@@ -68,8 +68,10 @@ spec:
       {{- end }}
       volumes:
         {{- include "servicefoundry-server.volumes" . | nindent 8 }}
+      {{- if .Values.servicefoundryServer.nodeSelector }}
       nodeSelector:
-        {{- include "servicefoundry-server.nodeSelector" . | nindent 8 }}
+        {{- toYaml .Values.servicefoundryServer.nodeSelector | nindent 8 }}
+      {{- end }}
       {{- $mergedAffinity := dict | merge .Values.servicefoundryServer.affinity .Values.global.affinity }}
       {{- if $mergedAffinity }}
       affinity:

diff --git a/charts/truefoundry/templates/sfy-manifest-service/_helpers.tpl b/charts/truefoundry/templates/sfy-manifest-service/_helpers.tpl
@@ -102,12 +102,3 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 {{- end }}
 {{- end }}
-
-{{/*
-  Merge nodeSelector
-  */}}
-{{- define "sfy-manifest-service.nodeSelector" -}}
-{{- $defaultNodeSelector := dict "kubernetes.io/arch" "amd64" }}
-{{- $mergedNodeSelector := merge .Values.sfyManifestService.nodeSelector $defaultNodeSelector }}
-{{- toYaml $mergedNodeSelector }}
-{{- end }}
diff --git a/charts/truefoundry/templates/sfy-manifest-service/deployment.yaml b/charts/truefoundry/templates/sfy-manifest-service/deployment.yaml
@@ -56,8 +56,10 @@ spec:
       {{- end }}
       volumes:
       {{- toYaml .Values.sfyManifestService.extraVolumes | nindent 8 }}
+      {{- if .Values.sfyManifestService.nodeSelector }}
       nodeSelector:
-        {{- include "servicefoundry-server.nodeSelector" . | nindent 8 }}
+          {{- toYaml .Values.sfyManifestService.nodeSelector | nindent 8 }}
+      {{- end }}
       {{- $mergedAffinity := dict | merge .Values.servicefoundryServer.affinity .Values.global.affinity }}
       {{- if $mergedAffinity }}
       affinity:

diff --git a/charts/truefoundry/templates/tfy-controller/_helpers.tpl b/charts/truefoundry/templates/tfy-controller/_helpers.tpl
@@ -102,12 +102,3 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 {{- end }}
 {{- end }}
-
-{{/*
-  Merge default nodeSelector with nodeSelector specified in tfyController nodeSelector
-  */}}
-{{- define "tfy-controller.nodeSelector" -}}
-{{- $defaultNodeSelector := dict "kubernetes.io/arch" "amd64" }}
-{{- $mergedNodeSelector := merge .Values.tfyController.nodeSelector $defaultNodeSelector }}
-{{- toYaml $mergedNodeSelector }}
-{{- end }}
diff --git a/charts/truefoundry/templates/tfy-controller/deployment.yaml b/charts/truefoundry/templates/tfy-controller/deployment.yaml
@@ -61,8 +61,10 @@ spec:
             matchLabels:
               app.kubernetes.io/name: {{ include "tfy-controller.name" . }}
         {{- end }}
+      {{- if .Values.tfyController.nodeSelector }}
       nodeSelector:
-        {{- include "tfy-controller.nodeSelector" . | nindent 8 }}
+        {{- toYaml .Values.tfyController.nodeSelector | nindent 8 }}
+      {{- end }}
       {{- $mergedAffinity := dict | merge .Values.tfyController.affinity .Values.global.affinity }}
       {{- if $mergedAffinity }}
       affinity:

diff --git a/charts/truefoundry/templates/tfy-k8s-controller/_helpers.tpl b/charts/truefoundry/templates/tfy-k8s-controller/_helpers.tpl
@@ -125,12 +125,3 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 {{- $volumeMounts | toYaml -}}
 {{- end -}}
-
-{{/*
-  Merge default nodeSelector with nodeSelector specified in tfy-k8s-controller nodeSelector
-  */}}
-{{- define "tfy-k8s-controller.nodeSelector" -}}
-{{- $defaultNodeSelector := dict "kubernetes.io/arch" "amd64" }}
-{{- $mergedNodeSelector := merge .Values.tfyK8sController.nodeSelector $defaultNodeSelector }}
-{{- toYaml $mergedNodeSelector }}
-{{- end }}
diff --git a/charts/truefoundry/templates/tfy-k8s-controller/deployment.yaml b/charts/truefoundry/templates/tfy-k8s-controller/deployment.yaml
@@ -66,8 +66,10 @@ spec:
       {{- end }}
       volumes:
         {{- include "tfy-k8s-controller.volumes" . | nindent 8 }}
+      {{- if .Values.tfyK8sController.nodeSelector }}
       nodeSelector:
-        {{- include "tfy-k8s-controller.nodeSelector" . | nindent 8 }}
+        {{- toYaml .Values.tfyK8sController.nodeSelector | nindent 8 }}
+      {{- end }}
       {{- $mergedAffinity := dict | merge .Values.tfyK8sController.affinity .Values.global.affinity }}
       {{- if $mergedAffinity }}
       affinity:

diff --git a/charts/truefoundry/templates/tfy-workflow-admin/_helpers.tpl b/charts/truefoundry/templates/tfy-workflow-admin/_helpers.tpl
@@ -102,12 +102,3 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 {{- end }}
 {{- end }}
-
-{{/*
-  Merge default nodeSelector with nodeSelector specified in tfyWorkflowAdmin nodeSelector
-  */}}
-{{- define "tfy-workflow-admin.nodeSelector" -}}
-{{- $defaultNodeSelector := dict "kubernetes.io/arch" "amd64" }}
-{{- $mergedNodeSelector := merge .Values.tfyWorkflowAdmin.nodeSelector $defaultNodeSelector }}
-{{- toYaml $mergedNodeSelector }}
-{{- end }}
diff --git a/charts/truefoundry/templates/tfy-workflow-admin/deployment.yaml b/charts/truefoundry/templates/tfy-workflow-admin/deployment.yaml
@@ -76,9 +76,9 @@ spec:
         - name: {{ include "tfy-workflow-admin.fullname" . }}-tfy-api-key
           secret:
             secretName: truefoundry-creds
-      {{- with .Values.tfyWorkflowAdmin.nodeSelector }}
+      {{- if .Values.tfyWorkflowAdmin.nodeSelector }}
       nodeSelector:
-        {{- toYaml . | nindent 8 }}
+        {{- toYaml .Values.tfyWorkflowAdmin.nodeSelector | nindent 8 }}
       {{- end }}
       {{- $mergedAffinity := dict | merge .Values.tfyWorkflowAdmin.affinity .Values.global.affinity }}
       {{- if $mergedAffinity }}
@@ -164,8 +164,10 @@ spec:
         - name: {{ include "tfy-workflow-admin.fullname" . }}-tfy-api-key
           secret:
             secretName: truefoundry-creds
+      {{- if .Values.tfyWorkflowAdmin.nodeSelector }}
       nodeSelector:
-        {{- include "tfy-workflow-admin.nodeSelector" . | nindent 8 }}
+        {{- toYaml .Values.tfyWorkflowAdmin.nodeSelector | nindent 8 }}
+      {{- end }}
       {{- $mergedAffinity := dict | merge .Values.tfyWorkflowAdmin.affinity .Values.global.affinity }}
       {{- if $mergedAffinity }}
       affinity:

diff --git a/charts/truefoundry/values.yaml b/charts/truefoundry/values.yaml
@@ -15,7 +15,7 @@ global:
   ## @param global.controlPlaneURL URL of the control plane
   controlPlaneURL: "http://truefoundry-truefoundry-frontend-app.truefoundry.svc.cluster.local:5000"
   ## @param global.controlPlaneChartVersion Version of control-plane chart
-  controlPlaneChartVersion: 0.18.1
+  controlPlaneChartVersion: 0.19.0
   # If you have an existing truefoundry-creds secret, provide the name here.
   # This will ignore `.global.database` and `.global.tfyApiKey` values.
   ## @param global.existingTruefoundryCredsSecret Name of the existing truefoundry creds secret
@@ -113,7 +113,7 @@ truefoundryFrontendApp:
     ## @param truefoundryFrontendApp.image.repository Image repository for the frontend app
     repository: "tfy.jfrog.io/tfy-private-images/truefoundry-frontend-app"
     ## @param truefoundryFrontendApp.image.tag Image tag for the frontend app
-    tag: "v0.17.0"
+    tag: "v0.18.0"
   ## @param truefoundryFrontendApp.envSecretName Secret name for the frontend app environment variables
   envSecretName: truefoundry-frontend-app-env-secret
   ## @param truefoundryFrontendApp.imagePullPolicy Image pull policy for the frontend app
@@ -391,7 +391,7 @@ servicefoundryServer:
     ## @param servicefoundryServer.image.repository Image repository for the servicefoundry server
     repository: "tfy.jfrog.io/tfy-private-images/servicefoundry-server"
     ## @param servicefoundryServer.image.tag Image tag for the servicefoundry server
-    tag: "v0.18.0"
+    tag: "v0.19.0"
   ## @param servicefoundryServer.environmentName Environment name for the servicefoundry server
   environmentName: default
   ## @param servicefoundryServer.envSecretName Secret name for the servicefoundry server environment variables
@@ -538,7 +538,7 @@ tfyK8sController:
     ## @param tfyK8sController.image.repository Image repository for the tfyK8sController
     repository: "tfy.jfrog.io/tfy-private-images/tfy-k8s-controller"
     ## @param tfyK8sController.image.tag Image tag for the tfyK8sController
-    tag: "v0.15.0"
+    tag: "v0.16.0"
   ## @param tfyK8sController.environmentName Environment name for tfyK8sController
   environmentName: default
   ## @param tfyK8sController.envSecretName Secret name for the tfyK8sController environment variables
@@ -633,7 +633,7 @@ sfyManifestService:
     ## @param sfyManifestService.image.repository Image repository for the sfy manifest service
     repository: "tfy.jfrog.io/tfy-private-images/sfy-manifest-service"
     ## @param sfyManifestService.image.tag Image tag for the sfy manifest service
-    tag: "v0.15.0"
+    tag: "v0.16.0"
   ## @param sfyManifestService.replicaCount Number of replicas for the sfy manifest service
   replicaCount: 1
   ## @param sfyManifestService.environmentName Environment name for the sfy manifest service