Skip to content

Commit 8bf1de6

Browse files
SovietacedSovietaced
authored
Cleanup helm template since metrics path is not configurable (#6444)
* metrics path is not configurable Signed-off-by: Jason Parraga <sovietaced@gmail.com> * make helm Signed-off-by: Jason Parraga <sovietaced@gmail.com> --------- Signed-off-by: Jason Parraga <sovietaced@gmail.com>
1 parent 3295eaf commit 8bf1de6

6 files changed

Lines changed: 8 additions & 9 deletions

File tree

‎charts/flyte-core/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ helm install gateway bitnami/contour -n flyte
7575
| cloud_events.kafka.tlsConfig.keyPath | string | `"/etc/ssl/certs/kafka-client.key"` | Path to the client private key |
7676
| cloud_events.kafka.version | string | `"3.7.0"` | The version of Kafka |
7777
| cloud_events.type | string | `"aws"` | |
78-
| cluster_resource_manager | object | `{"annotations":{},"config":{"cluster_resources":{"customData":[{"production":[{"projectQuotaCpu":{"value":"5"}},{"projectQuotaMemory":{"value":"4000Mi"}}]},{"staging":[{"projectQuotaCpu":{"value":"2"}},{"projectQuotaMemory":{"value":"3000Mi"}}]},{"development":[{"projectQuotaCpu":{"value":"4"}},{"projectQuotaMemory":{"value":"3000Mi"}}]}],"refreshInterval":"5m","standaloneDeployment":false,"templatePath":"/etc/flyte/clusterresource/templates"}},"enabled":true,"nodeSelector":{},"podAnnotations":{},"podEnv":{},"podLabels":{},"prometheus":{"enabled":false,"path":"/metrics","port":10254},"resources":{},"service_account_name":"flyteadmin","standaloneDeployment":false,"strategy":{},"templates":[{"key":"aa_namespace","value":"apiVersion: v1\nkind: Namespace\nmetadata:\n name: {{ namespace }}\nspec:\n finalizers:\n - kubernetes\n"},{"key":"ab_project_resource_quota","value":"apiVersion: v1\nkind: ResourceQuota\nmetadata:\n name: project-quota\n namespace: {{ namespace }}\nspec:\n hard:\n limits.cpu: {{ projectQuotaCpu }}\n limits.memory: {{ projectQuotaMemory }}\n"}]}` | Configuration for the Cluster resource manager component. This is an optional component, that enables automatic cluster configuration. This is useful to set default quotas, manage namespaces etc that map to a project/domain |
78+
| cluster_resource_manager | object | `{"annotations":{},"config":{"cluster_resources":{"customData":[{"production":[{"projectQuotaCpu":{"value":"5"}},{"projectQuotaMemory":{"value":"4000Mi"}}]},{"staging":[{"projectQuotaCpu":{"value":"2"}},{"projectQuotaMemory":{"value":"3000Mi"}}]},{"development":[{"projectQuotaCpu":{"value":"4"}},{"projectQuotaMemory":{"value":"3000Mi"}}]}],"refreshInterval":"5m","standaloneDeployment":false,"templatePath":"/etc/flyte/clusterresource/templates"}},"enabled":true,"nodeSelector":{},"podAnnotations":{},"podEnv":{},"podLabels":{},"prometheus":{"enabled":false,"port":10254},"resources":{},"service_account_name":"flyteadmin","standaloneDeployment":false,"strategy":{},"templates":[{"key":"aa_namespace","value":"apiVersion: v1\nkind: Namespace\nmetadata:\n name: {{ namespace }}\nspec:\n finalizers:\n - kubernetes\n"},{"key":"ab_project_resource_quota","value":"apiVersion: v1\nkind: ResourceQuota\nmetadata:\n name: project-quota\n namespace: {{ namespace }}\nspec:\n hard:\n limits.cpu: {{ projectQuotaCpu }}\n limits.memory: {{ projectQuotaMemory }}\n"}]}` | Configuration for the Cluster resource manager component. This is an optional component, that enables automatic cluster configuration. This is useful to set default quotas, manage namespaces etc that map to a project/domain |
7979
| cluster_resource_manager.annotations | object | `{}` | Annotations for ClusterResource deployment |
8080
| cluster_resource_manager.config | object | `{"cluster_resources":{"customData":[{"production":[{"projectQuotaCpu":{"value":"5"}},{"projectQuotaMemory":{"value":"4000Mi"}}]},{"staging":[{"projectQuotaCpu":{"value":"2"}},{"projectQuotaMemory":{"value":"3000Mi"}}]},{"development":[{"projectQuotaCpu":{"value":"4"}},{"projectQuotaMemory":{"value":"3000Mi"}}]}],"refreshInterval":"5m","standaloneDeployment":false,"templatePath":"/etc/flyte/clusterresource/templates"}}` | Configmap for ClusterResource parameters |
8181
| cluster_resource_manager.config.cluster_resources | object | `{"customData":[{"production":[{"projectQuotaCpu":{"value":"5"}},{"projectQuotaMemory":{"value":"4000Mi"}}]},{"staging":[{"projectQuotaCpu":{"value":"2"}},{"projectQuotaMemory":{"value":"3000Mi"}}]},{"development":[{"projectQuotaCpu":{"value":"4"}},{"projectQuotaMemory":{"value":"3000Mi"}}]}],"refreshInterval":"5m","standaloneDeployment":false,"templatePath":"/etc/flyte/clusterresource/templates"}` | ClusterResource parameters Refer to the [structure](https://pkg.go.dev/github.com/lyft/flyteadmin@v0.3.37/pkg/runtime/interfaces#ClusterResourceConfig) to customize. |

‎charts/flyte-core/templates/clusterresourcesync/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
{{- with .Values.cluster_resource_manager.podAnnotations }}
2626
{{- toYaml . | nindent 8 }}
2727
{{- end }}
28-
prometheus.io/path: {{ .Values.cluster_resource_manager.prometheus.path | quote }}
28+
prometheus.io/path: "/metrics"
2929
prometheus.io/port: {{ .Values.cluster_resource_manager.prometheus.port | quote }}
3030
{{- with .Values.cluster_resource_manager.prometheus.enabled }}
3131
prometheus.io/scrape: "true"

‎charts/flyte-core/values.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,6 @@ cluster_resource_manager:
10941094

10951095
prometheus:
10961096
enabled: false
1097-
path: "/metrics"
10981097
port: 10254
10991098

11001099
# -- Resource templates that should be applied

‎docker/sandbox-bundled/manifests/complete-connector.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@ type: Opaque
822822
---
823823
apiVersion: v1
824824
data:
825-
haSharedSecret: MUVDdmNNcGp5elptYUZVYw==
825+
haSharedSecret: R2Y5TjJiMXJWeGl6cEVYeg==
826826
proxyPassword: ""
827827
proxyUsername: ""
828828
kind: Secret
@@ -1419,7 +1419,7 @@ spec:
14191419
metadata:
14201420
annotations:
14211421
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
1422-
checksum/secret: 7667fa65354f64f5bd5e1a3411aeb426ca1b1dfd30da0dc5b839882e544c3df3
1422+
checksum/secret: d16fd6f9a37fa084c02366a2ac36d91c589a8f8c0ed6bf6a525b1142aa3b8689
14231423
labels:
14241424
app: docker-registry
14251425
release: flyte-sandbox

‎docker/sandbox-bundled/manifests/complete.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ type: Opaque
803803
---
804804
apiVersion: v1
805805
data:
806-
haSharedSecret: MHNmNm1uWUNZRlhYZ2ZKQw==
806+
haSharedSecret: SUZqWDFOSThuSHZGdlNHeg==
807807
proxyPassword: ""
808808
proxyUsername: ""
809809
kind: Secret
@@ -1367,7 +1367,7 @@ spec:
13671367
metadata:
13681368
annotations:
13691369
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
1370-
checksum/secret: 5552105ec2becfef1a96b9c0ac4042b77f032a97d10e1ecae99b1ea0ec439b8c
1370+
checksum/secret: b7358657815c05ca593cf3ccbc66ce0369e17f9fae7986c0d6edf6abc5cb512d
13711371
labels:
13721372
app: docker-registry
13731373
release: flyte-sandbox

‎docker/sandbox-bundled/manifests/dev.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ metadata:
499499
---
500500
apiVersion: v1
501501
data:
502-
haSharedSecret: RFQxTHcyeUFnaW1BVDB0dw==
502+
haSharedSecret: VzFrSUF4ZHZnNGRnbU5ZUw==
503503
proxyPassword: ""
504504
proxyUsername: ""
505505
kind: Secret
@@ -934,7 +934,7 @@ spec:
934934
metadata:
935935
annotations:
936936
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
937-
checksum/secret: 7b643c488e0e560009c4feb885d6ed2dc09b13c91d975ab577a8c86fbec6cf10
937+
checksum/secret: 41e6ba30ebee486d51ee181e08956b050f64f835be9fa2a967f27b9ad57df570
938938
labels:
939939
app: docker-registry
940940
release: flyte-sandbox

0 commit comments

Comments
 (0)