diff --git a/charts/tfy-k8s-aws-eks-inframold/Chart.yaml b/charts/tfy-k8s-aws-eks-inframold/Chart.yaml index 326f7f56..dcd4eec0 100644 --- a/charts/tfy-k8s-aws-eks-inframold/Chart.yaml +++ b/charts/tfy-k8s-aws-eks-inframold/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: tfy-k8s-aws-eks-inframold -version: 0.1.14 +version: 0.1.15 description: "Inframold, the superchart that configure your cluster on aws for truefoundry." maintainers: - name: truefoundry diff --git a/charts/tfy-k8s-aws-eks-inframold/README.md b/charts/tfy-k8s-aws-eks-inframold/README.md index a617539d..5dd7467e 100644 --- a/charts/tfy-k8s-aws-eks-inframold/README.md +++ b/charts/tfy-k8s-aws-eks-inframold/README.md @@ -55,6 +55,7 @@ Inframold, the superchart that configure your cluster on aws for truefoundry. | Name | Description | Value | | ------------------------------ | ------------------------------------------ | ------ | | `metricsServer.enabled` | Flag to enable Metrics Server | `true` | +| `metricsServer.enabled` | Flag to enable Metrics Server | `true` | | `metricsServer.valuesOverride` | Config override from default config values | `{}` | ### AWS parameters @@ -71,6 +72,7 @@ Inframold, the superchart that configure your cluster on aws for truefoundry. | `aws.karpenter.roleArn` | Role ARN for Karpenter | `""` | | `aws.karpenter.instanceProfile` | Instance profile for Karpenter | `""` | | `aws.karpenter.defaultZones` | Default zones list for Karpenter | `[]` | +| `aws.karpenter.webhook.enabled` | Flag to enable Karpenter webhook | `false` | | `aws.karpenter.interruptionQueue` | Interruption queue name for Karpenter | `""` | | `aws.karpenter.valuesOverride` | Config override from default config values | `{}` | | `aws.awsEbsCsiDriver.enabled` | Flag to enable AWS EBS CSI Driver | `true` | @@ -136,6 +138,7 @@ Inframold, the superchart that configure your cluster on aws for truefoundry. | Name | Description | Value | | ------------------------------ | ------------------------------------------ | ------ | | `istio.enabled` | Flag to enable Istio | `true` | +| `istio.enabled` | Flag to enable Istio Base | `true` | | `istio.base.valuesOverride` | Config override from default config values | `{}` | | `istio.gateway.valuesOverride` | Config override from default config values | `{}` | @@ -178,11 +181,12 @@ Inframold, the superchart that configure your cluster on aws for truefoundry. ### tfyAgent parameters -| Name | Description | Value | -| ------------------------- | ------------------------------------------ | ------ | -| `tfyAgent.enabled` | Flag to enable Tfy Agent | `true` | -| `tfyAgent.clusterToken` | cluster token | `""` | -| `tfyAgent.valuesOverride` | Config override from default config values | `{}` | +| Name | Description | Value | +| ----------------------------- | ------------------------------------------ | ------ | +| `tfyAgent.enabled` | Flag to enable Tfy Agent | `true` | +| `tfyAgent.clusterToken` | cluster token | `""` | +| `tfyAgent.valuesOverride` | Config override from default config values | `{}` | +| `tfyAgent.clusterTokenSecret` | Secret name for cluster token | `""` | ### elasti parameters @@ -193,7 +197,9 @@ Inframold, the superchart that configure your cluster on aws for truefoundry. ### jspolicy parameters -| Name | Description | Value | -| ------------------------- | -------------------------------------------------------- | ------- | -| `jspolicy.enabled` | Flag to enable jspolicy. No policy is applied by default | `false` | -| `jspolicy.valuesOverride` | Config override from default config values | `{}` | +| Name | Description | Value | +| -------------------------------- | -------------------------------------------------------- | ------- | +| `jspolicy.enabled` | Flag to enable jspolicy. No policy is applied by default | `false` | +| `jspolicy.enabled` | Flag to enable jspolicy | `false` | +| `jspolicy.valuesOverride` | Config override from default config values | `{}` | +| `jspolicy.config.valuesOverride` | Config override from default config values | `{}` | diff --git a/charts/tfy-k8s-aws-eks-inframold/artifacts-manifest.json b/charts/tfy-k8s-aws-eks-inframold/artifacts-manifest.json index 9c098a20..27d0046c 100644 --- a/charts/tfy-k8s-aws-eks-inframold/artifacts-manifest.json +++ b/charts/tfy-k8s-aws-eks-inframold/artifacts-manifest.json @@ -174,9 +174,9 @@ "details": { "chart": "tfy-agent", "repoURL": "https://truefoundry.github.io/infra-charts/", - "targetRevision": "0.2.42", + "targetRevision": "0.2.45", "images": [ - "tfy.jfrog.io/tfy-images/tfy-agent:abdd060d96379a09bed4d6c2ab7516a11e154bfa", + "tfy.jfrog.io/tfy-images/tfy-agent:90b1a98dd017206a85c0e3406c87560bd763703b", "tfy.jfrog.io/tfy-images/tfy-agent-proxy:fcfb8e398eb01f05fb72cd9115b9ec69a89b9cce" ] } @@ -265,15 +265,15 @@ "type": "helm", "details": { "chart": "truefoundry", - "repoURL": "https://truefoundry.github.io/infra-charts", - "targetRevision": "0.15.0", + "repoURL": "oci://tfy.jfrog.io/tfy-helm", + "targetRevision": "0.16.2", "images": [ - "tfy.jfrog.io/tfy-private-images/mlfoundry-server:v0.12.0", - "tfy.jfrog.io/tfy-private-images/servicefoundry-server:v0.15.0", - "tfy.jfrog.io/tfy-private-images/sfy-manifest-service:v0.12.0", + "tfy.jfrog.io/tfy-private-images/mlfoundry-server:v0.13.0", + "tfy.jfrog.io/tfy-private-images/servicefoundry-server:v0.16.0", + "tfy.jfrog.io/tfy-private-images/sfy-manifest-service:v0.13.0", "tfy.jfrog.io/tfy-private-images/tfy-controller:v0.9.0", - "tfy.jfrog.io/tfy-private-images/tfy-k8s-controller:v0.12.0", - "tfy.jfrog.io/tfy-private-images/truefoundry-frontend-app:v0.14.0", + "tfy.jfrog.io/tfy-private-images/tfy-k8s-controller:v0.13.0", + "tfy.jfrog.io/tfy-private-images/truefoundry-frontend-app:v0.15.2", "tfy.jfrog.io/tfy-mirror/nats:2.10.22-alpine3.20", "tfy.jfrog.io/tfy-mirror/natsio/nats-server-config-reloader:0.14.3", "tfy.jfrog.io/tfy-mirror/natsio/prometheus-nats-exporter:0.15.0", @@ -966,7 +966,7 @@ { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-images/tfy-agent:abdd060d96379a09bed4d6c2ab7516a11e154bfa", + "registryURL": "tfy.jfrog.io/tfy-images/tfy-agent:90b1a98dd017206a85c0e3406c87560bd763703b", "platforms": [] } }, @@ -1210,21 +1210,21 @@ { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/mlfoundry-server:v0.12.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/mlfoundry-server:v0.13.0", "platforms": [] } }, { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/servicefoundry-server:v0.15.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/servicefoundry-server:v0.16.0", "platforms": [] } }, { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/sfy-manifest-service:v0.12.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/sfy-manifest-service:v0.13.0", "platforms": [] } }, @@ -1238,14 +1238,14 @@ { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/tfy-k8s-controller:v0.12.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/tfy-k8s-controller:v0.13.0", "platforms": [] } }, { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/truefoundry-frontend-app:v0.14.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/truefoundry-frontend-app:v0.15.2", "platforms": [] } }, diff --git a/charts/tfy-k8s-aws-eks-inframold/templates/argocd.yaml b/charts/tfy-k8s-aws-eks-inframold/templates/argocd.yaml index 206f3fce..51515025 100644 --- a/charts/tfy-k8s-aws-eks-inframold/templates/argocd.yaml +++ b/charts/tfy-k8s-aws-eks-inframold/templates/argocd.yaml @@ -149,7 +149,7 @@ spec: {{- end }} {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - CreateNamespace=true - ServerSideApply=true diff --git a/charts/tfy-k8s-aws-eks-inframold/templates/jspolicy.yaml b/charts/tfy-k8s-aws-eks-inframold/templates/jspolicy.yaml index fd58614c..3ad5454c 100644 --- a/charts/tfy-k8s-aws-eks-inframold/templates/jspolicy.yaml +++ b/charts/tfy-k8s-aws-eks-inframold/templates/jspolicy.yaml @@ -27,7 +27,7 @@ spec: npm_config_registry: "https://tfy.jfrog.io/artifactory/api/npm/tfy-npm-registry-local" {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - RespectIgnoreDifferences=true - CreateNamespace=true diff --git a/charts/tfy-k8s-aws-eks-inframold/templates/keda.yaml b/charts/tfy-k8s-aws-eks-inframold/templates/keda.yaml index 91b5bc93..b2ecb4c1 100644 --- a/charts/tfy-k8s-aws-eks-inframold/templates/keda.yaml +++ b/charts/tfy-k8s-aws-eks-inframold/templates/keda.yaml @@ -63,7 +63,7 @@ spec: {{- end }} {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - RespectIgnoreDifferences=true - CreateNamespace=true diff --git a/charts/tfy-k8s-aws-eks-inframold/templates/prometheus.yaml b/charts/tfy-k8s-aws-eks-inframold/templates/prometheus.yaml index 897a084c..ad299895 100644 --- a/charts/tfy-k8s-aws-eks-inframold/templates/prometheus.yaml +++ b/charts/tfy-k8s-aws-eks-inframold/templates/prometheus.yaml @@ -265,10 +265,9 @@ spec: receiver: tfy-agent repeat_interval: 1h receivers: - - name: tfy-agent - webhook_configs: - - url: http://tfy-agent.tfy-agent.svc.cluster.local:3000/alerts - send_resolved: true + {{- with .Values.prometheus.alertmanager.config.receivers -}} + {{ toYaml . | nindent 12 }} + {{- end }} alertmanagerSpec: resources: requests: diff --git a/charts/tfy-k8s-aws-eks-inframold/templates/tfy-agent.yaml b/charts/tfy-k8s-aws-eks-inframold/templates/tfy-agent.yaml index e8d5a56d..9219dce7 100644 --- a/charts/tfy-k8s-aws-eks-inframold/templates/tfy-agent.yaml +++ b/charts/tfy-k8s-aws-eks-inframold/templates/tfy-agent.yaml @@ -14,7 +14,7 @@ spec: server: https://kubernetes.default.svc project: tfy-apps source: - targetRevision: 0.2.42 + targetRevision: 0.2.45 repoURL: https://truefoundry.github.io/infra-charts/ chart: tfy-agent helm: @@ -23,9 +23,10 @@ spec: {{ .Values.tfyAgent.valuesOverride | toYaml | nindent 8 }} {{- else }} config: - clusterToken: {{ .Values.tfyAgent.clusterToken}} - tenantName: {{ .Values.tenantName}} - controlPlaneURL: {{ .Values.controlPlaneURL}} + clusterToken: {{ .Values.tfyAgent.clusterToken }} + tenantName: {{ .Values.tenantName }} + controlPlaneURL: {{ .Values.controlPlaneURL }} + clusterTokenSecret: {{ .Values.tfyAgent.clusterTokenSecret }} tfyAgent: resources: limits: diff --git a/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/aws-ebs-csi-driver.yaml b/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/aws-ebs-csi-driver.yaml index ce16f006..46812dc7 100644 --- a/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/aws-ebs-csi-driver.yaml +++ b/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/aws-ebs-csi-driver.yaml @@ -60,7 +60,7 @@ spec: {{- end }} project: tfy-apps syncPolicy: - automated: { } + automated: {} syncOptions: - CreateNamespace=true - ServerSideApply=true diff --git a/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/aws-efs-csi-driver.yaml b/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/aws-efs-csi-driver.yaml index 0490d49e..0ffc3840 100644 --- a/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/aws-efs-csi-driver.yaml +++ b/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/aws-efs-csi-driver.yaml @@ -47,7 +47,7 @@ spec: {{- end }} project: tfy-apps syncPolicy: - automated: { } + automated: {} syncOptions: - CreateNamespace=true - ServerSideApply=true diff --git a/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/aws-load-balancer-controller.yaml b/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/aws-load-balancer-controller.yaml index 17174e55..5cef49b7 100644 --- a/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/aws-load-balancer-controller.yaml +++ b/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/aws-load-balancer-controller.yaml @@ -30,7 +30,7 @@ spec: {{- end }} project: tfy-apps syncPolicy: - automated: { } + automated: {} syncOptions: - RespectIgnoreDifferences=true - CreateNamespace=true diff --git a/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/karpenter.yaml b/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/karpenter.yaml index e02d3ce8..511c4c4e 100644 --- a/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/karpenter.yaml +++ b/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/karpenter.yaml @@ -20,15 +20,15 @@ spec: chart: tfy-karpenter helm: values: |- - {{- if .Values.aws.inferentia.valuesOverride }} - {{ .Values.aws.inferentia.valuesOverride | toYaml | nindent 8 }} + {{- if .Values.aws.karpenter.valuesOverride }} + {{ .Values.aws.karpenter.valuesOverride | toYaml | nindent 8 }} {{- else }} karpenter: serviceAccount: annotations: eks.amazonaws.com/role-arn: {{ .Values.aws.karpenter.roleArn }} webhook: - enabled: false + enabled: {{ .Values.aws.karpenter.webhook.enabled }} settings: clusterName: {{ .Values.clusterName }} clusterEndpoint: {{ .Values.aws.karpenter.clusterEndpoint }} diff --git a/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/tfy-inferentia-operator.yaml b/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/tfy-inferentia-operator.yaml index 519fb707..40419102 100644 --- a/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/tfy-inferentia-operator.yaml +++ b/charts/tfy-k8s-aws-eks-inframold/templates/tfy-aws/tfy-inferentia-operator.yaml @@ -19,8 +19,8 @@ spec: targetRevision: 0.2.1 helm: values: |- - {{- if .Values.metricsServer.valuesOverride }} - {{ .Values.metricsServer.valuesOverride | toYaml | nindent 8 }} + {{- if .Values.aws.inferentia.valuesOverride }} + {{ .Values.aws.inferentia.valuesOverride | toYaml | nindent 8 }} {{- else }} {} {{- end }} diff --git a/charts/tfy-k8s-aws-eks-inframold/templates/tfy-jspolicy-config.yaml b/charts/tfy-k8s-aws-eks-inframold/templates/tfy-jspolicy-config.yaml index 36f6c8f7..4c58bb65 100644 --- a/charts/tfy-k8s-aws-eks-inframold/templates/tfy-jspolicy-config.yaml +++ b/charts/tfy-k8s-aws-eks-inframold/templates/tfy-jspolicy-config.yaml @@ -19,13 +19,13 @@ spec: targetRevision: 0.2.0 helm: values: |- - {{- if .Values.jspolicy.valuesOverride }} - {{ .Values.jspolicy.valuesOverride | toYaml | nindent 8 }} + {{- if .Values.jspolicy.config.valuesOverride }} + {{ .Values.jspolicy.config.valuesOverride | toYaml | nindent 8 }} {{- else }} {} {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - RespectIgnoreDifferences=true - CreateNamespace=true diff --git a/charts/tfy-k8s-aws-eks-inframold/templates/truefoundry.yaml b/charts/tfy-k8s-aws-eks-inframold/templates/truefoundry.yaml index 9804aced..1546de29 100644 --- a/charts/tfy-k8s-aws-eks-inframold/templates/truefoundry.yaml +++ b/charts/tfy-k8s-aws-eks-inframold/templates/truefoundry.yaml @@ -14,8 +14,8 @@ spec: server: https://kubernetes.default.svc project: tfy-apps source: - targetRevision: 0.15.0 - repoURL: "https://truefoundry.github.io/infra-charts" + targetRevision: 0.16.2 + repoURL: "tfy.jfrog.io/tfy-helm" chart: truefoundry helm: values: |- @@ -34,11 +34,11 @@ spec: password: {{ .Values.truefoundry.database.password }} {{- with .Values.tolerations }} tolerations: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} {{- with .Values.affinity }} affinity: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} devMode: enabled: {{ .Values.truefoundry.devMode.enabled }} @@ -51,7 +51,7 @@ spec: enabled: true {{- if .Values.truefoundry.virtualservice.hosts }} hosts: - {{- range $v := .Values.truefoundry.virtualservice.hosts }} + {{- range $v := .Values.truefoundry.virtualservice.hosts }} - {{ $v | quote }} {{- end }} {{- end }} @@ -61,15 +61,15 @@ spec: - {{ $v | quote }} {{- end }} {{- end }} - {{- end }} + {{- end }} nats: {{- with .Values.tolerations }} tolerations: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} {{- with .Values.affinity }} affinity: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} {{- end }} syncPolicy: diff --git a/charts/tfy-k8s-aws-eks-inframold/values.yaml b/charts/tfy-k8s-aws-eks-inframold/values.yaml index 4767dacf..765c2788 100644 --- a/charts/tfy-k8s-aws-eks-inframold/values.yaml +++ b/charts/tfy-k8s-aws-eks-inframold/values.yaml @@ -22,13 +22,13 @@ tolerations: value: "true" effect: NoSchedule operator: Equal - + ## @param affinity [object] Affinity for the all chart components ## - + affinity: {} - + ## @section argocd parameters ## @param argocd.enabled Flag to enable ArgoCD @@ -90,15 +90,13 @@ certManager: ## @param metricsServer.enabled Flag to enable Metrics Server ## metricsServer: + ##@param metricsServer.enabled Flag to enable Metrics Server + enabled: true ## @param metricsServer.valuesOverride Config override from default config values ## valuesOverride: {} - enabled: true - - - - + ## @section AWS parameters ## AWS parameters ## @@ -139,6 +137,11 @@ aws: ## defaultZones: [] + ## @param aws.karpenter.webhook.enabled Flag to enable Karpenter webhook + ## + webhook: + enabled: false + ## @param aws.karpenter.interruptionQueue Interruption queue name for Karpenter ## interruptionQueue: "" @@ -180,7 +183,7 @@ aws: ## @param aws.inferentia.valuesOverride Config override from default config values ## valuesOverride: {} - + ## @section gpu parameters ## @param gpu.enabled Flag to enable Tfy GPU Operator @@ -250,7 +253,10 @@ loki: ## @param istio.enabled Flag to enable Istio ## istio: + ## @param istio.enabled Flag to enable Istio Base + ## enabled: true + base: ## @param istio.base.valuesOverride Config override from default config values ## @@ -313,21 +319,30 @@ prometheus: enabled: true ## @skip prometheus.additionalScrapeConfigs Additional scrape configs for Prometheus ## - additionalScrapeConfigs: - - job_name: gpu-metrics - scrape_interval: 15s - scrape_timeout: 10s - metrics_path: /metrics - scheme: http - kubernetes_sd_configs: - - role: endpoints - namespaces: - names: - - tfy-gpu-operator - relabel_configs: - - source_labels: [__meta_kubernetes_pod_node_name] - action: replace - target_label: kubernetes_node + additionalScrapeConfigs: + - job_name: gpu-metrics + scrape_interval: 15s + scrape_timeout: 10s + metrics_path: /metrics + scheme: http + kubernetes_sd_configs: + - role: endpoints + namespaces: + names: + - tfy-gpu-operator + relabel_configs: + - source_labels: [__meta_kubernetes_pod_node_name] + action: replace + target_label: kubernetes_node + ## @skip prometheus.alertmanager Alertmanager configuration for Prometheus + ## + alertmanager: + config: + receivers: + - name: tfy-agent + webhook_configs: + - url: http://tfy-agent.tfy-agent.svc.cluster.local:3000/alerts + send_resolved: true ## @param prometheus.valuesOverride Config override from default config values ## valuesOverride: {} @@ -355,6 +370,10 @@ tfyAgent: ## valuesOverride: {} + ## @param tfyAgent.clusterTokenSecret Secret name for cluster token + ## Secret for cluster token + clusterTokenSecret: "" + ## @section elasti parameters ## @param elasti.enabled Flag to enable Elasti ## @@ -368,7 +387,14 @@ elasti: ## @param jspolicy.enabled Flag to enable jspolicy. No policy is applied by default ## jspolicy: + ## @param jspolicy.enabled Flag to enable jspolicy enabled: false ## @param jspolicy.valuesOverride Config override from default config values ## valuesOverride: {} + + + config: + ## @param jspolicy.config.valuesOverride Config override from default config values + ## + valuesOverride: {} diff --git a/charts/tfy-k8s-azure-aks-inframold/Chart.yaml b/charts/tfy-k8s-azure-aks-inframold/Chart.yaml index a2a94a97..f96a16a0 100644 --- a/charts/tfy-k8s-azure-aks-inframold/Chart.yaml +++ b/charts/tfy-k8s-azure-aks-inframold/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: tfy-k8s-azure-aks-inframold -version: 0.1.14 +version: 0.1.15 description: "Inframold, the superchart that configure your cluster on azure for truefoundry." maintainers: - name: truefoundry diff --git a/charts/tfy-k8s-azure-aks-inframold/README.md b/charts/tfy-k8s-azure-aks-inframold/README.md index be79d75e..6980bdc3 100644 --- a/charts/tfy-k8s-azure-aks-inframold/README.md +++ b/charts/tfy-k8s-azure-aks-inframold/README.md @@ -55,6 +55,7 @@ Inframold, the superchart that configure your cluster on azure for truefoundry. | Name | Description | Value | | ------------------------------ | ------------------------------------------ | ------- | | `metricsServer.enabled` | Flag to enable Metrics Server | `false` | +| `metricsServer.enabled` | Flag to enable Metrics Server | `false` | | `metricsServer.valuesOverride` | Config override from default config values | `{}` | ### gpu parameters @@ -110,6 +111,7 @@ Inframold, the superchart that configure your cluster on azure for truefoundry. | Name | Description | Value | | ------------------------------ | ------------------------------------------ | ------ | | `istio.enabled` | Flag to enable Istio | `true` | +| `istio.enabled` | Flag to enable Istio Base | `true` | | `istio.base.valuesOverride` | Config override from default config values | `{}` | | `istio.gateway.valuesOverride` | Config override from default config values | `{}` | @@ -152,11 +154,12 @@ Inframold, the superchart that configure your cluster on azure for truefoundry. ### tfyAgent parameters -| Name | Description | Value | -| ------------------------- | ------------------------------------------ | ------ | -| `tfyAgent.enabled` | Flag to enable Tfy Agent | `true` | -| `tfyAgent.clusterToken` | cluster token | `""` | -| `tfyAgent.valuesOverride` | Config override from default config values | `{}` | +| Name | Description | Value | +| ----------------------------- | ------------------------------------------ | ------ | +| `tfyAgent.enabled` | Flag to enable Tfy Agent | `true` | +| `tfyAgent.clusterToken` | cluster token | `""` | +| `tfyAgent.valuesOverride` | Config override from default config values | `{}` | +| `tfyAgent.clusterTokenSecret` | Secret name for cluster token | `""` | ### elasti parameters @@ -167,7 +170,9 @@ Inframold, the superchart that configure your cluster on azure for truefoundry. ### jspolicy parameters -| Name | Description | Value | -| ------------------------- | -------------------------------------------------------- | ------- | -| `jspolicy.enabled` | Flag to enable jspolicy. No policy is applied by default | `false` | -| `jspolicy.valuesOverride` | Config override from default config values | `{}` | +| Name | Description | Value | +| -------------------------------- | -------------------------------------------------------- | ------- | +| `jspolicy.enabled` | Flag to enable jspolicy. No policy is applied by default | `false` | +| `jspolicy.enabled` | Flag to enable jspolicy | `false` | +| `jspolicy.valuesOverride` | Config override from default config values | `{}` | +| `jspolicy.config.valuesOverride` | Config override from default config values | `{}` | diff --git a/charts/tfy-k8s-azure-aks-inframold/artifacts-manifest.json b/charts/tfy-k8s-azure-aks-inframold/artifacts-manifest.json index e32955a2..53898ecd 100644 --- a/charts/tfy-k8s-azure-aks-inframold/artifacts-manifest.json +++ b/charts/tfy-k8s-azure-aks-inframold/artifacts-manifest.json @@ -163,9 +163,9 @@ "details": { "chart": "tfy-agent", "repoURL": "https://truefoundry.github.io/infra-charts/", - "targetRevision": "0.2.42", + "targetRevision": "0.2.45", "images": [ - "tfy.jfrog.io/tfy-images/tfy-agent:abdd060d96379a09bed4d6c2ab7516a11e154bfa", + "tfy.jfrog.io/tfy-images/tfy-agent:90b1a98dd017206a85c0e3406c87560bd763703b", "tfy.jfrog.io/tfy-images/tfy-agent-proxy:fcfb8e398eb01f05fb72cd9115b9ec69a89b9cce" ] } @@ -195,15 +195,15 @@ "type": "helm", "details": { "chart": "truefoundry", - "repoURL": "https://truefoundry.github.io/infra-charts", - "targetRevision": "0.15.0", + "repoURL": "oci://tfy.jfrog.io/tfy-helm", + "targetRevision": "0.16.2", "images": [ - "tfy.jfrog.io/tfy-private-images/mlfoundry-server:v0.12.0", - "tfy.jfrog.io/tfy-private-images/servicefoundry-server:v0.15.0", - "tfy.jfrog.io/tfy-private-images/sfy-manifest-service:v0.12.0", + "tfy.jfrog.io/tfy-private-images/mlfoundry-server:v0.13.0", + "tfy.jfrog.io/tfy-private-images/servicefoundry-server:v0.16.0", + "tfy.jfrog.io/tfy-private-images/sfy-manifest-service:v0.13.0", "tfy.jfrog.io/tfy-private-images/tfy-controller:v0.9.0", - "tfy.jfrog.io/tfy-private-images/tfy-k8s-controller:v0.12.0", - "tfy.jfrog.io/tfy-private-images/truefoundry-frontend-app:v0.14.0", + "tfy.jfrog.io/tfy-private-images/tfy-k8s-controller:v0.13.0", + "tfy.jfrog.io/tfy-private-images/truefoundry-frontend-app:v0.15.2", "tfy.jfrog.io/tfy-mirror/nats:2.10.22-alpine3.20", "tfy.jfrog.io/tfy-mirror/natsio/nats-server-config-reloader:0.14.3", "tfy.jfrog.io/tfy-mirror/natsio/prometheus-nats-exporter:0.15.0", @@ -851,7 +851,7 @@ { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-images/tfy-agent:abdd060d96379a09bed4d6c2ab7516a11e154bfa", + "registryURL": "tfy.jfrog.io/tfy-images/tfy-agent:90b1a98dd017206a85c0e3406c87560bd763703b", "platforms": [] } }, @@ -897,21 +897,21 @@ { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/mlfoundry-server:v0.12.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/mlfoundry-server:v0.13.0", "platforms": [] } }, { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/servicefoundry-server:v0.15.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/servicefoundry-server:v0.16.0", "platforms": [] } }, { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/sfy-manifest-service:v0.12.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/sfy-manifest-service:v0.13.0", "platforms": [] } }, @@ -925,14 +925,14 @@ { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/tfy-k8s-controller:v0.12.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/tfy-k8s-controller:v0.13.0", "platforms": [] } }, { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/truefoundry-frontend-app:v0.14.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/truefoundry-frontend-app:v0.15.2", "platforms": [] } }, diff --git a/charts/tfy-k8s-azure-aks-inframold/templates/argocd.yaml b/charts/tfy-k8s-azure-aks-inframold/templates/argocd.yaml index 206f3fce..51515025 100644 --- a/charts/tfy-k8s-azure-aks-inframold/templates/argocd.yaml +++ b/charts/tfy-k8s-azure-aks-inframold/templates/argocd.yaml @@ -149,7 +149,7 @@ spec: {{- end }} {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - CreateNamespace=true - ServerSideApply=true diff --git a/charts/tfy-k8s-azure-aks-inframold/templates/jspolicy.yaml b/charts/tfy-k8s-azure-aks-inframold/templates/jspolicy.yaml index fd58614c..3ad5454c 100644 --- a/charts/tfy-k8s-azure-aks-inframold/templates/jspolicy.yaml +++ b/charts/tfy-k8s-azure-aks-inframold/templates/jspolicy.yaml @@ -27,7 +27,7 @@ spec: npm_config_registry: "https://tfy.jfrog.io/artifactory/api/npm/tfy-npm-registry-local" {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - RespectIgnoreDifferences=true - CreateNamespace=true diff --git a/charts/tfy-k8s-azure-aks-inframold/templates/keda.yaml b/charts/tfy-k8s-azure-aks-inframold/templates/keda.yaml index 91b5bc93..b2ecb4c1 100644 --- a/charts/tfy-k8s-azure-aks-inframold/templates/keda.yaml +++ b/charts/tfy-k8s-azure-aks-inframold/templates/keda.yaml @@ -63,7 +63,7 @@ spec: {{- end }} {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - RespectIgnoreDifferences=true - CreateNamespace=true diff --git a/charts/tfy-k8s-azure-aks-inframold/templates/prometheus.yaml b/charts/tfy-k8s-azure-aks-inframold/templates/prometheus.yaml index 897a084c..ad299895 100644 --- a/charts/tfy-k8s-azure-aks-inframold/templates/prometheus.yaml +++ b/charts/tfy-k8s-azure-aks-inframold/templates/prometheus.yaml @@ -265,10 +265,9 @@ spec: receiver: tfy-agent repeat_interval: 1h receivers: - - name: tfy-agent - webhook_configs: - - url: http://tfy-agent.tfy-agent.svc.cluster.local:3000/alerts - send_resolved: true + {{- with .Values.prometheus.alertmanager.config.receivers -}} + {{ toYaml . | nindent 12 }} + {{- end }} alertmanagerSpec: resources: requests: diff --git a/charts/tfy-k8s-azure-aks-inframold/templates/tfy-agent.yaml b/charts/tfy-k8s-azure-aks-inframold/templates/tfy-agent.yaml index e8d5a56d..9219dce7 100644 --- a/charts/tfy-k8s-azure-aks-inframold/templates/tfy-agent.yaml +++ b/charts/tfy-k8s-azure-aks-inframold/templates/tfy-agent.yaml @@ -14,7 +14,7 @@ spec: server: https://kubernetes.default.svc project: tfy-apps source: - targetRevision: 0.2.42 + targetRevision: 0.2.45 repoURL: https://truefoundry.github.io/infra-charts/ chart: tfy-agent helm: @@ -23,9 +23,10 @@ spec: {{ .Values.tfyAgent.valuesOverride | toYaml | nindent 8 }} {{- else }} config: - clusterToken: {{ .Values.tfyAgent.clusterToken}} - tenantName: {{ .Values.tenantName}} - controlPlaneURL: {{ .Values.controlPlaneURL}} + clusterToken: {{ .Values.tfyAgent.clusterToken }} + tenantName: {{ .Values.tenantName }} + controlPlaneURL: {{ .Values.controlPlaneURL }} + clusterTokenSecret: {{ .Values.tfyAgent.clusterTokenSecret }} tfyAgent: resources: limits: diff --git a/charts/tfy-k8s-azure-aks-inframold/templates/tfy-jspolicy-config.yaml b/charts/tfy-k8s-azure-aks-inframold/templates/tfy-jspolicy-config.yaml index 36f6c8f7..4c58bb65 100644 --- a/charts/tfy-k8s-azure-aks-inframold/templates/tfy-jspolicy-config.yaml +++ b/charts/tfy-k8s-azure-aks-inframold/templates/tfy-jspolicy-config.yaml @@ -19,13 +19,13 @@ spec: targetRevision: 0.2.0 helm: values: |- - {{- if .Values.jspolicy.valuesOverride }} - {{ .Values.jspolicy.valuesOverride | toYaml | nindent 8 }} + {{- if .Values.jspolicy.config.valuesOverride }} + {{ .Values.jspolicy.config.valuesOverride | toYaml | nindent 8 }} {{- else }} {} {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - RespectIgnoreDifferences=true - CreateNamespace=true diff --git a/charts/tfy-k8s-azure-aks-inframold/templates/truefoundry.yaml b/charts/tfy-k8s-azure-aks-inframold/templates/truefoundry.yaml index 9804aced..1546de29 100644 --- a/charts/tfy-k8s-azure-aks-inframold/templates/truefoundry.yaml +++ b/charts/tfy-k8s-azure-aks-inframold/templates/truefoundry.yaml @@ -14,8 +14,8 @@ spec: server: https://kubernetes.default.svc project: tfy-apps source: - targetRevision: 0.15.0 - repoURL: "https://truefoundry.github.io/infra-charts" + targetRevision: 0.16.2 + repoURL: "tfy.jfrog.io/tfy-helm" chart: truefoundry helm: values: |- @@ -34,11 +34,11 @@ spec: password: {{ .Values.truefoundry.database.password }} {{- with .Values.tolerations }} tolerations: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} {{- with .Values.affinity }} affinity: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} devMode: enabled: {{ .Values.truefoundry.devMode.enabled }} @@ -51,7 +51,7 @@ spec: enabled: true {{- if .Values.truefoundry.virtualservice.hosts }} hosts: - {{- range $v := .Values.truefoundry.virtualservice.hosts }} + {{- range $v := .Values.truefoundry.virtualservice.hosts }} - {{ $v | quote }} {{- end }} {{- end }} @@ -61,15 +61,15 @@ spec: - {{ $v | quote }} {{- end }} {{- end }} - {{- end }} + {{- end }} nats: {{- with .Values.tolerations }} tolerations: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} {{- with .Values.affinity }} affinity: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} {{- end }} syncPolicy: diff --git a/charts/tfy-k8s-azure-aks-inframold/values.yaml b/charts/tfy-k8s-azure-aks-inframold/values.yaml index c80545c2..db7ea48b 100644 --- a/charts/tfy-k8s-azure-aks-inframold/values.yaml +++ b/charts/tfy-k8s-azure-aks-inframold/values.yaml @@ -22,16 +22,16 @@ tolerations: value: "true" effect: NoSchedule operator: Equal - + - key: kubernetes.azure.com/scalesetpriority value: "spot" effect: NoSchedule operator: Equal - + ## @param affinity [object] Affinity for the all chart components ## - + affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -42,7 +42,7 @@ affinity: values: - spot operator: In - + ## @section argocd parameters ## @param argocd.enabled Flag to enable ArgoCD @@ -104,15 +104,13 @@ certManager: ## @param metricsServer.enabled Flag to enable Metrics Server ## metricsServer: + ##@param metricsServer.enabled Flag to enable Metrics Server + enabled: false ## @param metricsServer.valuesOverride Config override from default config values ## valuesOverride: {} - enabled: false - - - - + ## @section gpu parameters ## @param gpu.enabled Flag to enable Tfy GPU Operator @@ -182,7 +180,10 @@ loki: ## @param istio.enabled Flag to enable Istio ## istio: + ## @param istio.enabled Flag to enable Istio Base + ## enabled: true + base: ## @param istio.base.valuesOverride Config override from default config values ## @@ -235,21 +236,30 @@ prometheus: enabled: true ## @skip prometheus.additionalScrapeConfigs Additional scrape configs for Prometheus ## - additionalScrapeConfigs: - - job_name: gpu-metrics - scrape_interval: 15s - scrape_timeout: 10s - metrics_path: /metrics - scheme: http - kubernetes_sd_configs: - - role: endpoints - namespaces: - names: - - tfy-gpu-operator - relabel_configs: - - source_labels: [__meta_kubernetes_pod_node_name] - action: replace - target_label: kubernetes_node + additionalScrapeConfigs: + - job_name: gpu-metrics + scrape_interval: 15s + scrape_timeout: 10s + metrics_path: /metrics + scheme: http + kubernetes_sd_configs: + - role: endpoints + namespaces: + names: + - tfy-gpu-operator + relabel_configs: + - source_labels: [__meta_kubernetes_pod_node_name] + action: replace + target_label: kubernetes_node + ## @skip prometheus.alertmanager Alertmanager configuration for Prometheus + ## + alertmanager: + config: + receivers: + - name: tfy-agent + webhook_configs: + - url: http://tfy-agent.tfy-agent.svc.cluster.local:3000/alerts + send_resolved: true ## @param prometheus.valuesOverride Config override from default config values ## valuesOverride: {} @@ -277,6 +287,10 @@ tfyAgent: ## valuesOverride: {} + ## @param tfyAgent.clusterTokenSecret Secret name for cluster token + ## Secret for cluster token + clusterTokenSecret: "" + ## @section elasti parameters ## @param elasti.enabled Flag to enable Elasti ## @@ -290,7 +304,14 @@ elasti: ## @param jspolicy.enabled Flag to enable jspolicy. No policy is applied by default ## jspolicy: + ## @param jspolicy.enabled Flag to enable jspolicy enabled: false ## @param jspolicy.valuesOverride Config override from default config values ## valuesOverride: {} + + + config: + ## @param jspolicy.config.valuesOverride Config override from default config values + ## + valuesOverride: {} diff --git a/charts/tfy-k8s-civo-talos-inframold/Chart.yaml b/charts/tfy-k8s-civo-talos-inframold/Chart.yaml index 32cc68dc..4b718c6a 100644 --- a/charts/tfy-k8s-civo-talos-inframold/Chart.yaml +++ b/charts/tfy-k8s-civo-talos-inframold/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: tfy-k8s-civo-talos-inframold -version: 0.1.14 +version: 0.1.15 description: "Inframold, the superchart that configure your cluster on civo for truefoundry." maintainers: - name: truefoundry diff --git a/charts/tfy-k8s-civo-talos-inframold/README.md b/charts/tfy-k8s-civo-talos-inframold/README.md index 0a58bcdc..e714f14e 100644 --- a/charts/tfy-k8s-civo-talos-inframold/README.md +++ b/charts/tfy-k8s-civo-talos-inframold/README.md @@ -55,6 +55,7 @@ Inframold, the superchart that configure your cluster on civo for truefoundry. | Name | Description | Value | | ------------------------------ | ------------------------------------------ | ------- | | `metricsServer.enabled` | Flag to enable Metrics Server | `false` | +| `metricsServer.enabled` | Flag to enable Metrics Server | `false` | | `metricsServer.valuesOverride` | Config override from default config values | `{}` | ### gpu parameters @@ -110,6 +111,7 @@ Inframold, the superchart that configure your cluster on civo for truefoundry. | Name | Description | Value | | ------------------------------ | ------------------------------------------ | ------ | | `istio.enabled` | Flag to enable Istio | `true` | +| `istio.enabled` | Flag to enable Istio Base | `true` | | `istio.base.valuesOverride` | Config override from default config values | `{}` | | `istio.gateway.valuesOverride` | Config override from default config values | `{}` | @@ -152,11 +154,12 @@ Inframold, the superchart that configure your cluster on civo for truefoundry. ### tfyAgent parameters -| Name | Description | Value | -| ------------------------- | ------------------------------------------ | ------ | -| `tfyAgent.enabled` | Flag to enable Tfy Agent | `true` | -| `tfyAgent.clusterToken` | cluster token | `""` | -| `tfyAgent.valuesOverride` | Config override from default config values | `{}` | +| Name | Description | Value | +| ----------------------------- | ------------------------------------------ | ------ | +| `tfyAgent.enabled` | Flag to enable Tfy Agent | `true` | +| `tfyAgent.clusterToken` | cluster token | `""` | +| `tfyAgent.valuesOverride` | Config override from default config values | `{}` | +| `tfyAgent.clusterTokenSecret` | Secret name for cluster token | `""` | ### elasti parameters @@ -167,7 +170,9 @@ Inframold, the superchart that configure your cluster on civo for truefoundry. ### jspolicy parameters -| Name | Description | Value | -| ------------------------- | -------------------------------------------------------- | ------- | -| `jspolicy.enabled` | Flag to enable jspolicy. No policy is applied by default | `false` | -| `jspolicy.valuesOverride` | Config override from default config values | `{}` | +| Name | Description | Value | +| -------------------------------- | -------------------------------------------------------- | ------- | +| `jspolicy.enabled` | Flag to enable jspolicy. No policy is applied by default | `false` | +| `jspolicy.enabled` | Flag to enable jspolicy | `false` | +| `jspolicy.valuesOverride` | Config override from default config values | `{}` | +| `jspolicy.config.valuesOverride` | Config override from default config values | `{}` | diff --git a/charts/tfy-k8s-civo-talos-inframold/templates/argocd.yaml b/charts/tfy-k8s-civo-talos-inframold/templates/argocd.yaml index 206f3fce..51515025 100644 --- a/charts/tfy-k8s-civo-talos-inframold/templates/argocd.yaml +++ b/charts/tfy-k8s-civo-talos-inframold/templates/argocd.yaml @@ -149,7 +149,7 @@ spec: {{- end }} {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - CreateNamespace=true - ServerSideApply=true diff --git a/charts/tfy-k8s-civo-talos-inframold/templates/jspolicy.yaml b/charts/tfy-k8s-civo-talos-inframold/templates/jspolicy.yaml index fd58614c..3ad5454c 100644 --- a/charts/tfy-k8s-civo-talos-inframold/templates/jspolicy.yaml +++ b/charts/tfy-k8s-civo-talos-inframold/templates/jspolicy.yaml @@ -27,7 +27,7 @@ spec: npm_config_registry: "https://tfy.jfrog.io/artifactory/api/npm/tfy-npm-registry-local" {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - RespectIgnoreDifferences=true - CreateNamespace=true diff --git a/charts/tfy-k8s-civo-talos-inframold/templates/keda.yaml b/charts/tfy-k8s-civo-talos-inframold/templates/keda.yaml index 91b5bc93..b2ecb4c1 100644 --- a/charts/tfy-k8s-civo-talos-inframold/templates/keda.yaml +++ b/charts/tfy-k8s-civo-talos-inframold/templates/keda.yaml @@ -63,7 +63,7 @@ spec: {{- end }} {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - RespectIgnoreDifferences=true - CreateNamespace=true diff --git a/charts/tfy-k8s-civo-talos-inframold/templates/prometheus.yaml b/charts/tfy-k8s-civo-talos-inframold/templates/prometheus.yaml index 897a084c..ad299895 100644 --- a/charts/tfy-k8s-civo-talos-inframold/templates/prometheus.yaml +++ b/charts/tfy-k8s-civo-talos-inframold/templates/prometheus.yaml @@ -265,10 +265,9 @@ spec: receiver: tfy-agent repeat_interval: 1h receivers: - - name: tfy-agent - webhook_configs: - - url: http://tfy-agent.tfy-agent.svc.cluster.local:3000/alerts - send_resolved: true + {{- with .Values.prometheus.alertmanager.config.receivers -}} + {{ toYaml . | nindent 12 }} + {{- end }} alertmanagerSpec: resources: requests: diff --git a/charts/tfy-k8s-civo-talos-inframold/templates/tfy-agent.yaml b/charts/tfy-k8s-civo-talos-inframold/templates/tfy-agent.yaml index e8d5a56d..9219dce7 100644 --- a/charts/tfy-k8s-civo-talos-inframold/templates/tfy-agent.yaml +++ b/charts/tfy-k8s-civo-talos-inframold/templates/tfy-agent.yaml @@ -14,7 +14,7 @@ spec: server: https://kubernetes.default.svc project: tfy-apps source: - targetRevision: 0.2.42 + targetRevision: 0.2.45 repoURL: https://truefoundry.github.io/infra-charts/ chart: tfy-agent helm: @@ -23,9 +23,10 @@ spec: {{ .Values.tfyAgent.valuesOverride | toYaml | nindent 8 }} {{- else }} config: - clusterToken: {{ .Values.tfyAgent.clusterToken}} - tenantName: {{ .Values.tenantName}} - controlPlaneURL: {{ .Values.controlPlaneURL}} + clusterToken: {{ .Values.tfyAgent.clusterToken }} + tenantName: {{ .Values.tenantName }} + controlPlaneURL: {{ .Values.controlPlaneURL }} + clusterTokenSecret: {{ .Values.tfyAgent.clusterTokenSecret }} tfyAgent: resources: limits: diff --git a/charts/tfy-k8s-civo-talos-inframold/templates/tfy-jspolicy-config.yaml b/charts/tfy-k8s-civo-talos-inframold/templates/tfy-jspolicy-config.yaml index 36f6c8f7..4c58bb65 100644 --- a/charts/tfy-k8s-civo-talos-inframold/templates/tfy-jspolicy-config.yaml +++ b/charts/tfy-k8s-civo-talos-inframold/templates/tfy-jspolicy-config.yaml @@ -19,13 +19,13 @@ spec: targetRevision: 0.2.0 helm: values: |- - {{- if .Values.jspolicy.valuesOverride }} - {{ .Values.jspolicy.valuesOverride | toYaml | nindent 8 }} + {{- if .Values.jspolicy.config.valuesOverride }} + {{ .Values.jspolicy.config.valuesOverride | toYaml | nindent 8 }} {{- else }} {} {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - RespectIgnoreDifferences=true - CreateNamespace=true diff --git a/charts/tfy-k8s-civo-talos-inframold/templates/truefoundry.yaml b/charts/tfy-k8s-civo-talos-inframold/templates/truefoundry.yaml index 9804aced..1546de29 100644 --- a/charts/tfy-k8s-civo-talos-inframold/templates/truefoundry.yaml +++ b/charts/tfy-k8s-civo-talos-inframold/templates/truefoundry.yaml @@ -14,8 +14,8 @@ spec: server: https://kubernetes.default.svc project: tfy-apps source: - targetRevision: 0.15.0 - repoURL: "https://truefoundry.github.io/infra-charts" + targetRevision: 0.16.2 + repoURL: "tfy.jfrog.io/tfy-helm" chart: truefoundry helm: values: |- @@ -34,11 +34,11 @@ spec: password: {{ .Values.truefoundry.database.password }} {{- with .Values.tolerations }} tolerations: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} {{- with .Values.affinity }} affinity: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} devMode: enabled: {{ .Values.truefoundry.devMode.enabled }} @@ -51,7 +51,7 @@ spec: enabled: true {{- if .Values.truefoundry.virtualservice.hosts }} hosts: - {{- range $v := .Values.truefoundry.virtualservice.hosts }} + {{- range $v := .Values.truefoundry.virtualservice.hosts }} - {{ $v | quote }} {{- end }} {{- end }} @@ -61,15 +61,15 @@ spec: - {{ $v | quote }} {{- end }} {{- end }} - {{- end }} + {{- end }} nats: {{- with .Values.tolerations }} tolerations: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} {{- with .Values.affinity }} affinity: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} {{- end }} syncPolicy: diff --git a/charts/tfy-k8s-civo-talos-inframold/values.yaml b/charts/tfy-k8s-civo-talos-inframold/values.yaml index fad8caf8..f4b667ac 100644 --- a/charts/tfy-k8s-civo-talos-inframold/values.yaml +++ b/charts/tfy-k8s-civo-talos-inframold/values.yaml @@ -22,13 +22,13 @@ tolerations: value: "true" effect: NoSchedule operator: Equal - + ## @param affinity [object] Affinity for the all chart components ## - + affinity: {} - + ## @section argocd parameters ## @param argocd.enabled Flag to enable ArgoCD @@ -90,15 +90,13 @@ certManager: ## @param metricsServer.enabled Flag to enable Metrics Server ## metricsServer: + ##@param metricsServer.enabled Flag to enable Metrics Server + enabled: false ## @param metricsServer.valuesOverride Config override from default config values ## valuesOverride: {} - enabled: false - - - - + ## @section gpu parameters ## @param gpu.enabled Flag to enable Tfy GPU Operator @@ -168,7 +166,10 @@ loki: ## @param istio.enabled Flag to enable Istio ## istio: + ## @param istio.enabled Flag to enable Istio Base + ## enabled: true + base: ## @param istio.base.valuesOverride Config override from default config values ## @@ -221,21 +222,30 @@ prometheus: enabled: true ## @skip prometheus.additionalScrapeConfigs Additional scrape configs for Prometheus ## - additionalScrapeConfigs: - - job_name: gpu-metrics - scrape_interval: 15s - scrape_timeout: 10s - metrics_path: /metrics - scheme: http - kubernetes_sd_configs: - - role: endpoints - namespaces: - names: - - tfy-gpu-operator - relabel_configs: - - source_labels: [__meta_kubernetes_pod_node_name] - action: replace - target_label: kubernetes_node + additionalScrapeConfigs: + - job_name: gpu-metrics + scrape_interval: 15s + scrape_timeout: 10s + metrics_path: /metrics + scheme: http + kubernetes_sd_configs: + - role: endpoints + namespaces: + names: + - tfy-gpu-operator + relabel_configs: + - source_labels: [__meta_kubernetes_pod_node_name] + action: replace + target_label: kubernetes_node + ## @skip prometheus.alertmanager Alertmanager configuration for Prometheus + ## + alertmanager: + config: + receivers: + - name: tfy-agent + webhook_configs: + - url: http://tfy-agent.tfy-agent.svc.cluster.local:3000/alerts + send_resolved: true ## @param prometheus.valuesOverride Config override from default config values ## valuesOverride: {} @@ -263,6 +273,10 @@ tfyAgent: ## valuesOverride: {} + ## @param tfyAgent.clusterTokenSecret Secret name for cluster token + ## Secret for cluster token + clusterTokenSecret: "" + ## @section elasti parameters ## @param elasti.enabled Flag to enable Elasti ## @@ -276,7 +290,14 @@ elasti: ## @param jspolicy.enabled Flag to enable jspolicy. No policy is applied by default ## jspolicy: + ## @param jspolicy.enabled Flag to enable jspolicy enabled: false ## @param jspolicy.valuesOverride Config override from default config values ## valuesOverride: {} + + + config: + ## @param jspolicy.config.valuesOverride Config override from default config values + ## + valuesOverride: {} diff --git a/charts/tfy-k8s-gcp-gke-standard-inframold/Chart.yaml b/charts/tfy-k8s-gcp-gke-standard-inframold/Chart.yaml index 9893c224..5f922121 100644 --- a/charts/tfy-k8s-gcp-gke-standard-inframold/Chart.yaml +++ b/charts/tfy-k8s-gcp-gke-standard-inframold/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: tfy-k8s-gcp-gke-standard-inframold -version: 0.1.14 +version: 0.1.15 description: "Inframold, the superchart that configure your cluster on gcp for truefoundry." maintainers: - name: truefoundry diff --git a/charts/tfy-k8s-gcp-gke-standard-inframold/README.md b/charts/tfy-k8s-gcp-gke-standard-inframold/README.md index 581f8771..500df1c4 100644 --- a/charts/tfy-k8s-gcp-gke-standard-inframold/README.md +++ b/charts/tfy-k8s-gcp-gke-standard-inframold/README.md @@ -55,6 +55,7 @@ Inframold, the superchart that configure your cluster on gcp for truefoundry. | Name | Description | Value | | ------------------------------ | ------------------------------------------ | ------- | | `metricsServer.enabled` | Flag to enable Metrics Server | `false` | +| `metricsServer.enabled` | Flag to enable Metrics Server | `false` | | `metricsServer.valuesOverride` | Config override from default config values | `{}` | ### gpu parameters @@ -110,6 +111,7 @@ Inframold, the superchart that configure your cluster on gcp for truefoundry. | Name | Description | Value | | ------------------------------ | ------------------------------------------ | ------ | | `istio.enabled` | Flag to enable Istio | `true` | +| `istio.enabled` | Flag to enable Istio Base | `true` | | `istio.base.valuesOverride` | Config override from default config values | `{}` | | `istio.gateway.valuesOverride` | Config override from default config values | `{}` | @@ -152,11 +154,12 @@ Inframold, the superchart that configure your cluster on gcp for truefoundry. ### tfyAgent parameters -| Name | Description | Value | -| ------------------------- | ------------------------------------------ | ------ | -| `tfyAgent.enabled` | Flag to enable Tfy Agent | `true` | -| `tfyAgent.clusterToken` | cluster token | `""` | -| `tfyAgent.valuesOverride` | Config override from default config values | `{}` | +| Name | Description | Value | +| ----------------------------- | ------------------------------------------ | ------ | +| `tfyAgent.enabled` | Flag to enable Tfy Agent | `true` | +| `tfyAgent.clusterToken` | cluster token | `""` | +| `tfyAgent.valuesOverride` | Config override from default config values | `{}` | +| `tfyAgent.clusterTokenSecret` | Secret name for cluster token | `""` | ### elasti parameters @@ -167,7 +170,9 @@ Inframold, the superchart that configure your cluster on gcp for truefoundry. ### jspolicy parameters -| Name | Description | Value | -| ------------------------- | -------------------------------------------------------- | ------- | -| `jspolicy.enabled` | Flag to enable jspolicy. No policy is applied by default | `false` | -| `jspolicy.valuesOverride` | Config override from default config values | `{}` | +| Name | Description | Value | +| -------------------------------- | -------------------------------------------------------- | ------- | +| `jspolicy.enabled` | Flag to enable jspolicy. No policy is applied by default | `false` | +| `jspolicy.enabled` | Flag to enable jspolicy | `false` | +| `jspolicy.valuesOverride` | Config override from default config values | `{}` | +| `jspolicy.config.valuesOverride` | Config override from default config values | `{}` | diff --git a/charts/tfy-k8s-gcp-gke-standard-inframold/artifacts-manifest.json b/charts/tfy-k8s-gcp-gke-standard-inframold/artifacts-manifest.json index fa570356..a7664773 100644 --- a/charts/tfy-k8s-gcp-gke-standard-inframold/artifacts-manifest.json +++ b/charts/tfy-k8s-gcp-gke-standard-inframold/artifacts-manifest.json @@ -163,9 +163,9 @@ "details": { "chart": "tfy-agent", "repoURL": "https://truefoundry.github.io/infra-charts/", - "targetRevision": "0.2.42", + "targetRevision": "0.2.45", "images": [ - "tfy.jfrog.io/tfy-images/tfy-agent:abdd060d96379a09bed4d6c2ab7516a11e154bfa", + "tfy.jfrog.io/tfy-images/tfy-agent:90b1a98dd017206a85c0e3406c87560bd763703b", "tfy.jfrog.io/tfy-images/tfy-agent-proxy:fcfb8e398eb01f05fb72cd9115b9ec69a89b9cce" ] } @@ -197,15 +197,15 @@ "type": "helm", "details": { "chart": "truefoundry", - "repoURL": "https://truefoundry.github.io/infra-charts", - "targetRevision": "0.15.0", + "repoURL": "oci://tfy.jfrog.io/tfy-helm", + "targetRevision": "0.16.2", "images": [ - "tfy.jfrog.io/tfy-private-images/mlfoundry-server:v0.12.0", - "tfy.jfrog.io/tfy-private-images/servicefoundry-server:v0.15.0", - "tfy.jfrog.io/tfy-private-images/sfy-manifest-service:v0.12.0", + "tfy.jfrog.io/tfy-private-images/mlfoundry-server:v0.13.0", + "tfy.jfrog.io/tfy-private-images/servicefoundry-server:v0.16.0", + "tfy.jfrog.io/tfy-private-images/sfy-manifest-service:v0.13.0", "tfy.jfrog.io/tfy-private-images/tfy-controller:v0.9.0", - "tfy.jfrog.io/tfy-private-images/tfy-k8s-controller:v0.12.0", - "tfy.jfrog.io/tfy-private-images/truefoundry-frontend-app:v0.14.0", + "tfy.jfrog.io/tfy-private-images/tfy-k8s-controller:v0.13.0", + "tfy.jfrog.io/tfy-private-images/truefoundry-frontend-app:v0.15.2", "tfy.jfrog.io/tfy-mirror/nats:2.10.22-alpine3.20", "tfy.jfrog.io/tfy-mirror/natsio/nats-server-config-reloader:0.14.3", "tfy.jfrog.io/tfy-mirror/natsio/prometheus-nats-exporter:0.15.0", @@ -853,7 +853,7 @@ { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-images/tfy-agent:abdd060d96379a09bed4d6c2ab7516a11e154bfa", + "registryURL": "tfy.jfrog.io/tfy-images/tfy-agent:90b1a98dd017206a85c0e3406c87560bd763703b", "platforms": [] } }, @@ -913,21 +913,21 @@ { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/mlfoundry-server:v0.12.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/mlfoundry-server:v0.13.0", "platforms": [] } }, { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/servicefoundry-server:v0.15.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/servicefoundry-server:v0.16.0", "platforms": [] } }, { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/sfy-manifest-service:v0.12.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/sfy-manifest-service:v0.13.0", "platforms": [] } }, @@ -941,14 +941,14 @@ { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/tfy-k8s-controller:v0.12.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/tfy-k8s-controller:v0.13.0", "platforms": [] } }, { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/truefoundry-frontend-app:v0.14.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/truefoundry-frontend-app:v0.15.2", "platforms": [] } }, diff --git a/charts/tfy-k8s-gcp-gke-standard-inframold/templates/argocd.yaml b/charts/tfy-k8s-gcp-gke-standard-inframold/templates/argocd.yaml index 206f3fce..51515025 100644 --- a/charts/tfy-k8s-gcp-gke-standard-inframold/templates/argocd.yaml +++ b/charts/tfy-k8s-gcp-gke-standard-inframold/templates/argocd.yaml @@ -149,7 +149,7 @@ spec: {{- end }} {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - CreateNamespace=true - ServerSideApply=true diff --git a/charts/tfy-k8s-gcp-gke-standard-inframold/templates/jspolicy.yaml b/charts/tfy-k8s-gcp-gke-standard-inframold/templates/jspolicy.yaml index fd58614c..3ad5454c 100644 --- a/charts/tfy-k8s-gcp-gke-standard-inframold/templates/jspolicy.yaml +++ b/charts/tfy-k8s-gcp-gke-standard-inframold/templates/jspolicy.yaml @@ -27,7 +27,7 @@ spec: npm_config_registry: "https://tfy.jfrog.io/artifactory/api/npm/tfy-npm-registry-local" {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - RespectIgnoreDifferences=true - CreateNamespace=true diff --git a/charts/tfy-k8s-gcp-gke-standard-inframold/templates/keda.yaml b/charts/tfy-k8s-gcp-gke-standard-inframold/templates/keda.yaml index 91b5bc93..b2ecb4c1 100644 --- a/charts/tfy-k8s-gcp-gke-standard-inframold/templates/keda.yaml +++ b/charts/tfy-k8s-gcp-gke-standard-inframold/templates/keda.yaml @@ -63,7 +63,7 @@ spec: {{- end }} {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - RespectIgnoreDifferences=true - CreateNamespace=true diff --git a/charts/tfy-k8s-gcp-gke-standard-inframold/templates/prometheus.yaml b/charts/tfy-k8s-gcp-gke-standard-inframold/templates/prometheus.yaml index 897a084c..ad299895 100644 --- a/charts/tfy-k8s-gcp-gke-standard-inframold/templates/prometheus.yaml +++ b/charts/tfy-k8s-gcp-gke-standard-inframold/templates/prometheus.yaml @@ -265,10 +265,9 @@ spec: receiver: tfy-agent repeat_interval: 1h receivers: - - name: tfy-agent - webhook_configs: - - url: http://tfy-agent.tfy-agent.svc.cluster.local:3000/alerts - send_resolved: true + {{- with .Values.prometheus.alertmanager.config.receivers -}} + {{ toYaml . | nindent 12 }} + {{- end }} alertmanagerSpec: resources: requests: diff --git a/charts/tfy-k8s-gcp-gke-standard-inframold/templates/tfy-agent.yaml b/charts/tfy-k8s-gcp-gke-standard-inframold/templates/tfy-agent.yaml index e8d5a56d..9219dce7 100644 --- a/charts/tfy-k8s-gcp-gke-standard-inframold/templates/tfy-agent.yaml +++ b/charts/tfy-k8s-gcp-gke-standard-inframold/templates/tfy-agent.yaml @@ -14,7 +14,7 @@ spec: server: https://kubernetes.default.svc project: tfy-apps source: - targetRevision: 0.2.42 + targetRevision: 0.2.45 repoURL: https://truefoundry.github.io/infra-charts/ chart: tfy-agent helm: @@ -23,9 +23,10 @@ spec: {{ .Values.tfyAgent.valuesOverride | toYaml | nindent 8 }} {{- else }} config: - clusterToken: {{ .Values.tfyAgent.clusterToken}} - tenantName: {{ .Values.tenantName}} - controlPlaneURL: {{ .Values.controlPlaneURL}} + clusterToken: {{ .Values.tfyAgent.clusterToken }} + tenantName: {{ .Values.tenantName }} + controlPlaneURL: {{ .Values.controlPlaneURL }} + clusterTokenSecret: {{ .Values.tfyAgent.clusterTokenSecret }} tfyAgent: resources: limits: diff --git a/charts/tfy-k8s-gcp-gke-standard-inframold/templates/tfy-jspolicy-config.yaml b/charts/tfy-k8s-gcp-gke-standard-inframold/templates/tfy-jspolicy-config.yaml index 36f6c8f7..4c58bb65 100644 --- a/charts/tfy-k8s-gcp-gke-standard-inframold/templates/tfy-jspolicy-config.yaml +++ b/charts/tfy-k8s-gcp-gke-standard-inframold/templates/tfy-jspolicy-config.yaml @@ -19,13 +19,13 @@ spec: targetRevision: 0.2.0 helm: values: |- - {{- if .Values.jspolicy.valuesOverride }} - {{ .Values.jspolicy.valuesOverride | toYaml | nindent 8 }} + {{- if .Values.jspolicy.config.valuesOverride }} + {{ .Values.jspolicy.config.valuesOverride | toYaml | nindent 8 }} {{- else }} {} {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - RespectIgnoreDifferences=true - CreateNamespace=true diff --git a/charts/tfy-k8s-gcp-gke-standard-inframold/templates/truefoundry.yaml b/charts/tfy-k8s-gcp-gke-standard-inframold/templates/truefoundry.yaml index 9804aced..1546de29 100644 --- a/charts/tfy-k8s-gcp-gke-standard-inframold/templates/truefoundry.yaml +++ b/charts/tfy-k8s-gcp-gke-standard-inframold/templates/truefoundry.yaml @@ -14,8 +14,8 @@ spec: server: https://kubernetes.default.svc project: tfy-apps source: - targetRevision: 0.15.0 - repoURL: "https://truefoundry.github.io/infra-charts" + targetRevision: 0.16.2 + repoURL: "tfy.jfrog.io/tfy-helm" chart: truefoundry helm: values: |- @@ -34,11 +34,11 @@ spec: password: {{ .Values.truefoundry.database.password }} {{- with .Values.tolerations }} tolerations: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} {{- with .Values.affinity }} affinity: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} devMode: enabled: {{ .Values.truefoundry.devMode.enabled }} @@ -51,7 +51,7 @@ spec: enabled: true {{- if .Values.truefoundry.virtualservice.hosts }} hosts: - {{- range $v := .Values.truefoundry.virtualservice.hosts }} + {{- range $v := .Values.truefoundry.virtualservice.hosts }} - {{ $v | quote }} {{- end }} {{- end }} @@ -61,15 +61,15 @@ spec: - {{ $v | quote }} {{- end }} {{- end }} - {{- end }} + {{- end }} nats: {{- with .Values.tolerations }} tolerations: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} {{- with .Values.affinity }} affinity: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} {{- end }} syncPolicy: diff --git a/charts/tfy-k8s-gcp-gke-standard-inframold/values.yaml b/charts/tfy-k8s-gcp-gke-standard-inframold/values.yaml index 5d81e774..35f9fc04 100644 --- a/charts/tfy-k8s-gcp-gke-standard-inframold/values.yaml +++ b/charts/tfy-k8s-gcp-gke-standard-inframold/values.yaml @@ -22,16 +22,16 @@ tolerations: value: "true" effect: NoSchedule operator: Equal - + - key: "cloud.google.com/gke-spot" value: "true" effect: NoSchedule operator: Equal - + ## @param affinity [object] Affinity for the all chart components ## - + affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -42,7 +42,7 @@ affinity: values: - "true" operator: In - + ## @section argocd parameters ## @param argocd.enabled Flag to enable ArgoCD @@ -104,15 +104,13 @@ certManager: ## @param metricsServer.enabled Flag to enable Metrics Server ## metricsServer: + ##@param metricsServer.enabled Flag to enable Metrics Server + enabled: false ## @param metricsServer.valuesOverride Config override from default config values ## valuesOverride: {} - enabled: false - - - - + ## @section gpu parameters ## @param gpu.enabled Flag to enable Tfy GPU Operator @@ -182,7 +180,10 @@ loki: ## @param istio.enabled Flag to enable Istio ## istio: + ## @param istio.enabled Flag to enable Istio Base + ## enabled: true + base: ## @param istio.base.valuesOverride Config override from default config values ## @@ -235,21 +236,30 @@ prometheus: enabled: true ## @skip prometheus.additionalScrapeConfigs Additional scrape configs for Prometheus ## - additionalScrapeConfigs: - - job_name: gpu-metrics - scrape_interval: 15s - scrape_timeout: 10s - metrics_path: /metrics - scheme: http - kubernetes_sd_configs: - - role: endpoints - namespaces: - names: - - tfy-gpu-operator - relabel_configs: - - source_labels: [__meta_kubernetes_pod_node_name] - action: replace - target_label: kubernetes_node + additionalScrapeConfigs: + - job_name: gpu-metrics + scrape_interval: 15s + scrape_timeout: 10s + metrics_path: /metrics + scheme: http + kubernetes_sd_configs: + - role: endpoints + namespaces: + names: + - tfy-gpu-operator + relabel_configs: + - source_labels: [__meta_kubernetes_pod_node_name] + action: replace + target_label: kubernetes_node + ## @skip prometheus.alertmanager Alertmanager configuration for Prometheus + ## + alertmanager: + config: + receivers: + - name: tfy-agent + webhook_configs: + - url: http://tfy-agent.tfy-agent.svc.cluster.local:3000/alerts + send_resolved: true ## @param prometheus.valuesOverride Config override from default config values ## valuesOverride: {} @@ -277,6 +287,10 @@ tfyAgent: ## valuesOverride: {} + ## @param tfyAgent.clusterTokenSecret Secret name for cluster token + ## Secret for cluster token + clusterTokenSecret: "" + ## @section elasti parameters ## @param elasti.enabled Flag to enable Elasti ## @@ -290,7 +304,14 @@ elasti: ## @param jspolicy.enabled Flag to enable jspolicy. No policy is applied by default ## jspolicy: + ## @param jspolicy.enabled Flag to enable jspolicy enabled: false ## @param jspolicy.valuesOverride Config override from default config values ## valuesOverride: {} + + + config: + ## @param jspolicy.config.valuesOverride Config override from default config values + ## + valuesOverride: {} diff --git a/charts/tfy-k8s-generic-inframold/Chart.yaml b/charts/tfy-k8s-generic-inframold/Chart.yaml index 9cb5d9c9..126a9817 100644 --- a/charts/tfy-k8s-generic-inframold/Chart.yaml +++ b/charts/tfy-k8s-generic-inframold/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: tfy-k8s-generic-inframold -version: 0.1.14 +version: 0.1.15 description: "Inframold, the superchart that configure your cluster on generic for truefoundry." maintainers: - name: truefoundry diff --git a/charts/tfy-k8s-generic-inframold/README.md b/charts/tfy-k8s-generic-inframold/README.md index ec8e85ce..681d769a 100644 --- a/charts/tfy-k8s-generic-inframold/README.md +++ b/charts/tfy-k8s-generic-inframold/README.md @@ -55,6 +55,7 @@ Inframold, the superchart that configure your cluster on generic for truefoundry | Name | Description | Value | | ------------------------------ | ------------------------------------------ | ------- | | `metricsServer.enabled` | Flag to enable Metrics Server | `false` | +| `metricsServer.enabled` | Flag to enable Metrics Server | `false` | | `metricsServer.valuesOverride` | Config override from default config values | `{}` | ### gpu parameters @@ -110,6 +111,7 @@ Inframold, the superchart that configure your cluster on generic for truefoundry | Name | Description | Value | | ------------------------------ | ------------------------------------------ | ------ | | `istio.enabled` | Flag to enable Istio | `true` | +| `istio.enabled` | Flag to enable Istio Base | `true` | | `istio.base.valuesOverride` | Config override from default config values | `{}` | | `istio.gateway.valuesOverride` | Config override from default config values | `{}` | @@ -152,11 +154,12 @@ Inframold, the superchart that configure your cluster on generic for truefoundry ### tfyAgent parameters -| Name | Description | Value | -| ------------------------- | ------------------------------------------ | ------ | -| `tfyAgent.enabled` | Flag to enable Tfy Agent | `true` | -| `tfyAgent.clusterToken` | cluster token | `""` | -| `tfyAgent.valuesOverride` | Config override from default config values | `{}` | +| Name | Description | Value | +| ----------------------------- | ------------------------------------------ | ------ | +| `tfyAgent.enabled` | Flag to enable Tfy Agent | `true` | +| `tfyAgent.clusterToken` | cluster token | `""` | +| `tfyAgent.valuesOverride` | Config override from default config values | `{}` | +| `tfyAgent.clusterTokenSecret` | Secret name for cluster token | `""` | ### elasti parameters @@ -167,7 +170,9 @@ Inframold, the superchart that configure your cluster on generic for truefoundry ### jspolicy parameters -| Name | Description | Value | -| ------------------------- | -------------------------------------------------------- | ------- | -| `jspolicy.enabled` | Flag to enable jspolicy. No policy is applied by default | `false` | -| `jspolicy.valuesOverride` | Config override from default config values | `{}` | +| Name | Description | Value | +| -------------------------------- | -------------------------------------------------------- | ------- | +| `jspolicy.enabled` | Flag to enable jspolicy. No policy is applied by default | `false` | +| `jspolicy.enabled` | Flag to enable jspolicy | `false` | +| `jspolicy.valuesOverride` | Config override from default config values | `{}` | +| `jspolicy.config.valuesOverride` | Config override from default config values | `{}` | diff --git a/charts/tfy-k8s-generic-inframold/artifacts-manifest.json b/charts/tfy-k8s-generic-inframold/artifacts-manifest.json index 708059b1..f594d372 100644 --- a/charts/tfy-k8s-generic-inframold/artifacts-manifest.json +++ b/charts/tfy-k8s-generic-inframold/artifacts-manifest.json @@ -150,9 +150,9 @@ "details": { "chart": "tfy-agent", "repoURL": "https://truefoundry.github.io/infra-charts/", - "targetRevision": "0.2.42", + "targetRevision": "0.2.45", "images": [ - "tfy.jfrog.io/tfy-images/tfy-agent:abdd060d96379a09bed4d6c2ab7516a11e154bfa", + "tfy.jfrog.io/tfy-images/tfy-agent:90b1a98dd017206a85c0e3406c87560bd763703b", "tfy.jfrog.io/tfy-images/tfy-agent-proxy:fcfb8e398eb01f05fb72cd9115b9ec69a89b9cce" ] } @@ -182,15 +182,15 @@ "type": "helm", "details": { "chart": "truefoundry", - "repoURL": "https://truefoundry.github.io/infra-charts", - "targetRevision": "0.15.0", + "repoURL": "oci://tfy.jfrog.io/tfy-helm", + "targetRevision": "0.16.2", "images": [ - "tfy.jfrog.io/tfy-private-images/mlfoundry-server:v0.12.0", - "tfy.jfrog.io/tfy-private-images/servicefoundry-server:v0.15.0", - "tfy.jfrog.io/tfy-private-images/sfy-manifest-service:v0.12.0", + "tfy.jfrog.io/tfy-private-images/mlfoundry-server:v0.13.0", + "tfy.jfrog.io/tfy-private-images/servicefoundry-server:v0.16.0", + "tfy.jfrog.io/tfy-private-images/sfy-manifest-service:v0.13.0", "tfy.jfrog.io/tfy-private-images/tfy-controller:v0.9.0", - "tfy.jfrog.io/tfy-private-images/tfy-k8s-controller:v0.12.0", - "tfy.jfrog.io/tfy-private-images/truefoundry-frontend-app:v0.14.0", + "tfy.jfrog.io/tfy-private-images/tfy-k8s-controller:v0.13.0", + "tfy.jfrog.io/tfy-private-images/truefoundry-frontend-app:v0.15.2", "tfy.jfrog.io/tfy-mirror/nats:2.10.22-alpine3.20", "tfy.jfrog.io/tfy-mirror/natsio/nats-server-config-reloader:0.14.3", "tfy.jfrog.io/tfy-mirror/natsio/prometheus-nats-exporter:0.15.0", @@ -790,7 +790,7 @@ { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-images/tfy-agent:abdd060d96379a09bed4d6c2ab7516a11e154bfa", + "registryURL": "tfy.jfrog.io/tfy-images/tfy-agent:90b1a98dd017206a85c0e3406c87560bd763703b", "platforms": [] } }, @@ -836,21 +836,21 @@ { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/mlfoundry-server:v0.12.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/mlfoundry-server:v0.13.0", "platforms": [] } }, { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/servicefoundry-server:v0.15.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/servicefoundry-server:v0.16.0", "platforms": [] } }, { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/sfy-manifest-service:v0.12.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/sfy-manifest-service:v0.13.0", "platforms": [] } }, @@ -864,14 +864,14 @@ { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/tfy-k8s-controller:v0.12.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/tfy-k8s-controller:v0.13.0", "platforms": [] } }, { "type": "image", "details": { - "registryURL": "tfy.jfrog.io/tfy-private-images/truefoundry-frontend-app:v0.14.0", + "registryURL": "tfy.jfrog.io/tfy-private-images/truefoundry-frontend-app:v0.15.2", "platforms": [] } }, diff --git a/charts/tfy-k8s-generic-inframold/templates/argocd.yaml b/charts/tfy-k8s-generic-inframold/templates/argocd.yaml index 206f3fce..51515025 100644 --- a/charts/tfy-k8s-generic-inframold/templates/argocd.yaml +++ b/charts/tfy-k8s-generic-inframold/templates/argocd.yaml @@ -149,7 +149,7 @@ spec: {{- end }} {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - CreateNamespace=true - ServerSideApply=true diff --git a/charts/tfy-k8s-generic-inframold/templates/jspolicy.yaml b/charts/tfy-k8s-generic-inframold/templates/jspolicy.yaml index fd58614c..3ad5454c 100644 --- a/charts/tfy-k8s-generic-inframold/templates/jspolicy.yaml +++ b/charts/tfy-k8s-generic-inframold/templates/jspolicy.yaml @@ -27,7 +27,7 @@ spec: npm_config_registry: "https://tfy.jfrog.io/artifactory/api/npm/tfy-npm-registry-local" {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - RespectIgnoreDifferences=true - CreateNamespace=true diff --git a/charts/tfy-k8s-generic-inframold/templates/keda.yaml b/charts/tfy-k8s-generic-inframold/templates/keda.yaml index 91b5bc93..b2ecb4c1 100644 --- a/charts/tfy-k8s-generic-inframold/templates/keda.yaml +++ b/charts/tfy-k8s-generic-inframold/templates/keda.yaml @@ -63,7 +63,7 @@ spec: {{- end }} {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - RespectIgnoreDifferences=true - CreateNamespace=true diff --git a/charts/tfy-k8s-generic-inframold/templates/prometheus.yaml b/charts/tfy-k8s-generic-inframold/templates/prometheus.yaml index 897a084c..ad299895 100644 --- a/charts/tfy-k8s-generic-inframold/templates/prometheus.yaml +++ b/charts/tfy-k8s-generic-inframold/templates/prometheus.yaml @@ -265,10 +265,9 @@ spec: receiver: tfy-agent repeat_interval: 1h receivers: - - name: tfy-agent - webhook_configs: - - url: http://tfy-agent.tfy-agent.svc.cluster.local:3000/alerts - send_resolved: true + {{- with .Values.prometheus.alertmanager.config.receivers -}} + {{ toYaml . | nindent 12 }} + {{- end }} alertmanagerSpec: resources: requests: diff --git a/charts/tfy-k8s-generic-inframold/templates/tfy-agent.yaml b/charts/tfy-k8s-generic-inframold/templates/tfy-agent.yaml index e8d5a56d..9219dce7 100644 --- a/charts/tfy-k8s-generic-inframold/templates/tfy-agent.yaml +++ b/charts/tfy-k8s-generic-inframold/templates/tfy-agent.yaml @@ -14,7 +14,7 @@ spec: server: https://kubernetes.default.svc project: tfy-apps source: - targetRevision: 0.2.42 + targetRevision: 0.2.45 repoURL: https://truefoundry.github.io/infra-charts/ chart: tfy-agent helm: @@ -23,9 +23,10 @@ spec: {{ .Values.tfyAgent.valuesOverride | toYaml | nindent 8 }} {{- else }} config: - clusterToken: {{ .Values.tfyAgent.clusterToken}} - tenantName: {{ .Values.tenantName}} - controlPlaneURL: {{ .Values.controlPlaneURL}} + clusterToken: {{ .Values.tfyAgent.clusterToken }} + tenantName: {{ .Values.tenantName }} + controlPlaneURL: {{ .Values.controlPlaneURL }} + clusterTokenSecret: {{ .Values.tfyAgent.clusterTokenSecret }} tfyAgent: resources: limits: diff --git a/charts/tfy-k8s-generic-inframold/templates/tfy-jspolicy-config.yaml b/charts/tfy-k8s-generic-inframold/templates/tfy-jspolicy-config.yaml index 36f6c8f7..4c58bb65 100644 --- a/charts/tfy-k8s-generic-inframold/templates/tfy-jspolicy-config.yaml +++ b/charts/tfy-k8s-generic-inframold/templates/tfy-jspolicy-config.yaml @@ -19,13 +19,13 @@ spec: targetRevision: 0.2.0 helm: values: |- - {{- if .Values.jspolicy.valuesOverride }} - {{ .Values.jspolicy.valuesOverride | toYaml | nindent 8 }} + {{- if .Values.jspolicy.config.valuesOverride }} + {{ .Values.jspolicy.config.valuesOverride | toYaml | nindent 8 }} {{- else }} {} {{- end }} syncPolicy: - automated: { } + automated: {} syncOptions: - RespectIgnoreDifferences=true - CreateNamespace=true diff --git a/charts/tfy-k8s-generic-inframold/templates/truefoundry.yaml b/charts/tfy-k8s-generic-inframold/templates/truefoundry.yaml index 9804aced..1546de29 100644 --- a/charts/tfy-k8s-generic-inframold/templates/truefoundry.yaml +++ b/charts/tfy-k8s-generic-inframold/templates/truefoundry.yaml @@ -14,8 +14,8 @@ spec: server: https://kubernetes.default.svc project: tfy-apps source: - targetRevision: 0.15.0 - repoURL: "https://truefoundry.github.io/infra-charts" + targetRevision: 0.16.2 + repoURL: "tfy.jfrog.io/tfy-helm" chart: truefoundry helm: values: |- @@ -34,11 +34,11 @@ spec: password: {{ .Values.truefoundry.database.password }} {{- with .Values.tolerations }} tolerations: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} {{- with .Values.affinity }} affinity: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} devMode: enabled: {{ .Values.truefoundry.devMode.enabled }} @@ -51,7 +51,7 @@ spec: enabled: true {{- if .Values.truefoundry.virtualservice.hosts }} hosts: - {{- range $v := .Values.truefoundry.virtualservice.hosts }} + {{- range $v := .Values.truefoundry.virtualservice.hosts }} - {{ $v | quote }} {{- end }} {{- end }} @@ -61,15 +61,15 @@ spec: - {{ $v | quote }} {{- end }} {{- end }} - {{- end }} + {{- end }} nats: {{- with .Values.tolerations }} tolerations: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} {{- with .Values.affinity }} affinity: - {{ toYaml . | nindent 12 }} + {{- toYaml . | nindent 12 }} {{- end }} {{- end }} syncPolicy: diff --git a/charts/tfy-k8s-generic-inframold/values.yaml b/charts/tfy-k8s-generic-inframold/values.yaml index 61ddea8a..cf649a6b 100644 --- a/charts/tfy-k8s-generic-inframold/values.yaml +++ b/charts/tfy-k8s-generic-inframold/values.yaml @@ -22,13 +22,13 @@ tolerations: value: "true" effect: NoSchedule operator: Equal - + ## @param affinity [object] Affinity for the all chart components ## - + affinity: {} - + ## @section argocd parameters ## @param argocd.enabled Flag to enable ArgoCD @@ -90,15 +90,13 @@ certManager: ## @param metricsServer.enabled Flag to enable Metrics Server ## metricsServer: + ##@param metricsServer.enabled Flag to enable Metrics Server + enabled: false ## @param metricsServer.valuesOverride Config override from default config values ## valuesOverride: {} - enabled: false - - - - + ## @section gpu parameters ## @param gpu.enabled Flag to enable Tfy GPU Operator @@ -168,7 +166,10 @@ loki: ## @param istio.enabled Flag to enable Istio ## istio: + ## @param istio.enabled Flag to enable Istio Base + ## enabled: true + base: ## @param istio.base.valuesOverride Config override from default config values ## @@ -221,21 +222,30 @@ prometheus: enabled: true ## @skip prometheus.additionalScrapeConfigs Additional scrape configs for Prometheus ## - additionalScrapeConfigs: - - job_name: gpu-metrics - scrape_interval: 15s - scrape_timeout: 10s - metrics_path: /metrics - scheme: http - kubernetes_sd_configs: - - role: endpoints - namespaces: - names: - - tfy-gpu-operator - relabel_configs: - - source_labels: [__meta_kubernetes_pod_node_name] - action: replace - target_label: kubernetes_node + additionalScrapeConfigs: + - job_name: gpu-metrics + scrape_interval: 15s + scrape_timeout: 10s + metrics_path: /metrics + scheme: http + kubernetes_sd_configs: + - role: endpoints + namespaces: + names: + - tfy-gpu-operator + relabel_configs: + - source_labels: [__meta_kubernetes_pod_node_name] + action: replace + target_label: kubernetes_node + ## @skip prometheus.alertmanager Alertmanager configuration for Prometheus + ## + alertmanager: + config: + receivers: + - name: tfy-agent + webhook_configs: + - url: http://tfy-agent.tfy-agent.svc.cluster.local:3000/alerts + send_resolved: true ## @param prometheus.valuesOverride Config override from default config values ## valuesOverride: {} @@ -263,6 +273,10 @@ tfyAgent: ## valuesOverride: {} + ## @param tfyAgent.clusterTokenSecret Secret name for cluster token + ## Secret for cluster token + clusterTokenSecret: "" + ## @section elasti parameters ## @param elasti.enabled Flag to enable Elasti ## @@ -276,7 +290,14 @@ elasti: ## @param jspolicy.enabled Flag to enable jspolicy. No policy is applied by default ## jspolicy: + ## @param jspolicy.enabled Flag to enable jspolicy enabled: false ## @param jspolicy.valuesOverride Config override from default config values ## valuesOverride: {} + + + config: + ## @param jspolicy.config.valuesOverride Config override from default config values + ## + valuesOverride: {}