From 494406eb144572e8f69390a354bcec46ad37c8e9 Mon Sep 17 00:00:00 2001 From: Abhishek Choudhary Date: Fri, 1 Nov 2024 15:28:57 +0530 Subject: [PATCH] [CI] Publish truefoundry to version (#758) * [CI] Publish Truefoundry chart version * Update README.md with readme-generator-for-helm Signed-off-by: innoavator --------- Signed-off-by: innoavator Co-authored-by: akashg3627 Co-authored-by: innoavator --- charts/truefoundry/Chart.lock | 6 +++--- charts/truefoundry/Chart.yaml | 4 ++-- charts/truefoundry/README.md | 8 +++++--- .../servicefoundry-server/_helpers.tpl | 20 +++++++++++++++++++ charts/truefoundry/values.yaml | 10 +++++++--- 5 files changed, 37 insertions(+), 11 deletions(-) diff --git a/charts/truefoundry/Chart.lock b/charts/truefoundry/Chart.lock index 94f3d105..97701fb7 100644 --- a/charts/truefoundry/Chart.lock +++ b/charts/truefoundry/Chart.lock @@ -1,7 +1,7 @@ dependencies: - name: tfy-configs repository: https://truefoundry.github.io/infra-charts - version: 0.1.4 + version: 0.1.5 - name: nats repository: https://nats-io.github.io/k8s/helm/charts/ version: 0.19.1 @@ -11,5 +11,5 @@ dependencies: - name: tfy-buildkitd-service repository: https://truefoundry.github.io/infra-charts/ version: 0.2.0 -digest: sha256:3a0f891df728b8b9b2d3294b8590e96d3052358a058bc7ccabd2f948232e1484 -generated: "2024-10-25T11:17:43.076265+05:30" +digest: sha256:568b049593765e6583cb046e218904cd5e04371283739d280da511dc2f4b6dd3 +generated: "2024-11-01T14:15:58.388967+05:30" diff --git a/charts/truefoundry/Chart.yaml b/charts/truefoundry/Chart.yaml index c94f58bb..67d0e09d 100644 --- a/charts/truefoundry/Chart.yaml +++ b/charts/truefoundry/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: truefoundry -version: 0.8.4 +version: 0.8.5 description: "TrueFoundry Control Plane Components" maintainers: - name: truefoundry @@ -8,7 +8,7 @@ dependencies: - condition: servicefoundryServer.enabled name: tfy-configs repository: https://truefoundry.github.io/infra-charts - version: 0.1.4 + version: 0.1.5 - condition: nats.enabled name: nats repository: https://nats-io.github.io/k8s/helm/charts/ diff --git a/charts/truefoundry/README.md b/charts/truefoundry/README.md index e696ecfd..c0494721 100644 --- 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.8.4` | +| `global.controlPlaneChartVersion` | Version of control-plane chart | `0.8.5` | | `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 | `""` | @@ -132,7 +132,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.8.2` | +| `servicefoundryServer.image.tag` | Image tag for the servicefoundry server | `v0.8.4` | | `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` | @@ -160,7 +160,9 @@ truefoundry is an applications that gets deployed on the kubernetes cluster to s | `servicefoundryServer.imagePullSecrets` | Image pull credentials for servicefoundry server | `[]` | | `servicefoundryServer.rbac.enabled` | Enable RBAC for the servicefoundry server | `true` | | `servicefoundryServer.configs.cicdTemplates` | CICD Template for servicefoundry server | `{{ .Release.Name }}-cicd-templates-cm` | -| `servicefoundryServer.configs.workbenchImages` | Workbench Images for servicefoundry server | `{{ .Release.Name }}-workbench-images-cm` | +| `servicefoundryServer.configs.workbenchImages` | Workbench Images for workbench deployments | `{{ .Release.Name }}-workbench-images-cm` | +| `servicefoundryServer.configs.imageMutationPolicy` | Image Mutations policy for workloads | `{{ .Release.Name }}-image-mutation-policy-cm` | +| `servicefoundryServer.configs.k8sManifestValidationPolicy` | K8s Manifest Validation policy for workloads | `{{ .Release.Name }}-k8s-manifest-validation-policy-cm` | ### tfyK8sController Truefoundry tfy k8s controller values diff --git a/charts/truefoundry/templates/servicefoundry-server/_helpers.tpl b/charts/truefoundry/templates/servicefoundry-server/_helpers.tpl index 9237e8d7..f076fc46 100644 --- a/charts/truefoundry/templates/servicefoundry-server/_helpers.tpl +++ b/charts/truefoundry/templates/servicefoundry-server/_helpers.tpl @@ -144,6 +144,14 @@ GLOBAL_BUILDERS_BUILDKIT_URLS: {{ $urls | trimPrefix "," }} - name: WORKBENCH_IMAGES_CONFIG_PATH value: /opt/truefoundry/configs/workbench-images/workbench-images.yaml {{- end }} +{{- if (tpl .Values.servicefoundryServer.configs.imageMutationPolicy .) }} +- name: IMAGE_MUTATION_POLICY_CONFIG_PATH + value: /opt/truefoundry/configs/image-mutation-policy/image-mutation-policy.yaml +{{- end }} +{{- if (tpl .Values.servicefoundryServer.configs.k8sManifestValidationPolicy .) }} +- name: K8S_MANIFEST_VALIDATION_POLICY_CONFIG_PATH + value: /opt/truefoundry/configs/k8s-manifest-validation-policy/k8s-manifest-validation-policy.yaml +{{- end }} {{- end }} {{- define "servicefoundry-server.volumes" -}} @@ -159,6 +167,12 @@ GLOBAL_BUILDERS_BUILDKIT_URLS: {{ $urls | trimPrefix "," }} {{- if (tpl .Values.servicefoundryServer.configs.workbenchImages .) }} {{- $volumes = append $volumes (dict "name" "configs-workbench-images" "configMap" (dict "name" (tpl .Values.servicefoundryServer.configs.workbenchImages .))) }} {{- end }} +{{- if (tpl .Values.servicefoundryServer.configs.imageMutationPolicy .) }} + {{- $volumes = append $volumes (dict "name" "configs-image-mutation-policy" "configMap" (dict "name" (tpl .Values.servicefoundryServer.configs.imageMutationPolicy .))) }} +{{- end }} +{{- if (tpl .Values.servicefoundryServer.configs.k8sManifestValidationPolicy .) }} + {{- $volumes = append $volumes (dict "name" "configs-k8s-manifest-validation-policy" "configMap" (dict "name" (tpl .Values.servicefoundryServer.configs.k8sManifestValidationPolicy .))) }} +{{- end }} {{- $volumes | toYaml -}} {{- end -}} @@ -177,6 +191,12 @@ GLOBAL_BUILDERS_BUILDKIT_URLS: {{ $urls | trimPrefix "," }} {{- if (tpl .Values.servicefoundryServer.configs.workbenchImages .) }} {{- $volumeMounts = append $volumeMounts (dict "name" "configs-workbench-images" "mountPath" "/opt/truefoundry/configs/workbench-images") }} {{- end }} +{{- if (tpl .Values.servicefoundryServer.configs.imageMutationPolicy .) }} + {{- $volumeMounts = append $volumeMounts (dict "name" "configs-image-mutation-policy" "mountPath" "/opt/truefoundry/configs/image-mutation-policy") }} +{{- end }} +{{- if (tpl .Values.servicefoundryServer.configs.k8sManifestValidationPolicy .) }} + {{- $volumeMounts = append $volumeMounts (dict "name" "configs-k8s-manifest-validation-policy" "mountPath" "/opt/truefoundry/configs/k8s-manifest-validation-policy") }} +{{- end }} {{- $volumeMounts | toYaml -}} {{- end -}} diff --git a/charts/truefoundry/values.yaml b/charts/truefoundry/values.yaml index abd05a29..32e09b64 100644 --- 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.8.4 + controlPlaneChartVersion: 0.8.5 # 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 @@ -382,7 +382,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.8.2" + tag: "v0.8.4" ## @param servicefoundryServer.environmentName Environment name for the servicefoundry server environmentName: default ## @param servicefoundryServer.envSecretName Secret name for the servicefoundry server environment variables @@ -517,8 +517,12 @@ servicefoundryServer: configs: ## @param servicefoundryServer.configs.cicdTemplates CICD Template for servicefoundry server cicdTemplates: '{{ .Release.Name }}-cicd-templates-cm' - ## @param servicefoundryServer.configs.workbenchImages Workbench Images for servicefoundry server + ## @param servicefoundryServer.configs.workbenchImages Workbench Images for workbench deployments workbenchImages: '{{ .Release.Name }}-workbench-images-cm' + ## @param servicefoundryServer.configs.imageMutationPolicy Image Mutations policy for workloads + imageMutationPolicy: '{{ .Release.Name }}-image-mutation-policy-cm' + ## @param servicefoundryServer.configs.k8sManifestValidationPolicy K8s Manifest Validation policy for workloads + k8sManifestValidationPolicy: '{{ .Release.Name }}-k8s-manifest-validation-policy-cm' ################################################################################################################### ####################################### Tfy K8s Controller ####################################################### ###################################################################################################################