fix: hodometer enable flag and docs (#5025)

* fix hodometer enable flag and docs

* remove sed script

docs/source/contents/metrics/usage.md

@@ -84,30 +84,20 @@ These Helm values and their equivalents are provided below:
 | `hodometer.extraPublishUrls` | `EXTRA_PUBLISH_URLS` |
 | `hodometer.logLevel` | `LOG_LEVEL` |
 
-If you do not want usage metrics to be recorded, you can disable Hodometer via the `hodometer.enabled` Helm value.
+If you do not want usage metrics to be recorded, you can disable Hodometer via the `hodometer.disable` Helm value when installing the runtime Helm chart.
 The following command disables collection of usage metrics in fresh installations and also serves to remove Hodometer from an existing installation:
 
 ```bash
-helm install seldon-core-v2 k8s/helm-charts/seldon-core-v2-setup \
+helm install seldon-v2-runtime k8s/helm-charts/seldon-core-v2-runtime \
   --namespace seldon-mesh \
-  --set hodometer.enabled=false
+  --set hodometer.disable=true
 ```
 
 ```{note}
 It is a good practice to set Helm values in values file.
 These can be applied by using the `-f <filename>` switch when running Helm.
 ```
 
-````
-````{group-tab} YAML
-
-The [raw YAML](../getting-started/kubernetes-installation/raw.md) approach to installing Seldon Core v2 provides an opinionated, pre-configured set of manifests.
-Hodometer is automatically enabled with this approach.
-
-You can disable Hodometer by manually removing the appropriate resources before applying the manifests.
-If you have an existing installation, you will also need to delete the deployment and, optionally, any of the RBAC resources.
-
-As there is no templating with the raw YAML manifests, you would need to set configuration environment variables manually before deploying them to a cluster.
 ````
 `````
 

k8s/Makefile

@@ -16,11 +16,7 @@ create-helm-charts:
 	kustomize build kustomize/helm-components-ns/ > ${HELM_COMPONENTS_BASE}/seldon-v2-components.yaml
 	kustomize build kustomize/helm-servers/ > ${HELM_SERVERS_BASE}/seldon-v2-servers.yaml
 	sed -i 's/\(.*\)\(imagePullSecrets:\).*/{{- with .Values.imagePullSecrets }}\n\1\2\n\1{{- toYaml . | nindent 8 }}\n{{- end }}/g' ${HELM_COMPONENTS_BASE}/seldon-v2-components.yaml
-	sed -n --file=add-helm-toggle-hodometer.sed ${HELM_COMPONENTS_BASE}/seldon-v2-components.yaml \
-		> ${HELM_COMPONENTS_BASE}/.components.yaml
-	sed 's/HACK_REMOVE_ME//' ${HELM_COMPONENTS_BASE}/.components.yaml \
-		> ${HELM_COMPONENTS_BASE}/seldon-v2-components.yaml
-	rm ${HELM_COMPONENTS_BASE}/.components.yaml
+	sed -i 's/HACK_REMOVE_ME//' ${HELM_COMPONENTS_BASE}/seldon-v2-components.yaml
 	sed 's/HACK_REMOVE_ME//' ${HELM_SERVERS_BASE}/seldon-v2-servers.yaml \
 		> ${HELM_SERVERS_BASE}/.seldon-v2-servers.yaml
 	sed -zi 's#\(apiVersion: rbac.authorization.k8s.io/v1\nkind: ClusterRole.*\- get\n\-\-\-\)#{{- if .Values.controller.clusterwide -}}\n\1\n{{- end }}#' ${HELM_COMPONENTS_BASE}/seldon-v2-components.yaml

k8s/helm-charts/seldon-core-v2-setup/templates/seldon-v2-components.yaml

@@ -1,4 +1,3 @@
-
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -887,7 +886,6 @@ spec:
         | nindent 8 }}
       serviceAccountName: seldon-controller-manager
       terminationGracePeriodSeconds: 10
-{{ if .Values.hodometer.enabled }}
 ---
 apiVersion: mlops.seldon.io/v1alpha1
 kind: SeldonConfig
@@ -1473,7 +1471,6 @@ spec:
       disable: {{ .Values.opentelemetry.disable }}
       otelExporterEndpoint: '{{ .Values.opentelemetry.endpoint }}'
       ratio: '{{ .Values.opentelemetry.ratio }}'
-{{ end }}
 ---
 apiVersion: mlops.seldon.io/v1alpha1
 kind: ServerConfig

k8s/helm-charts/seldon-core-v2-setup/values.yaml

@@ -79,7 +79,6 @@ opentelemetry:
   ratio: 1
 
 hodometer:
-  enabled: true
   image:
     pullPolicy: IfNotPresent
     registry: docker.io

k8s/helm-charts/seldon-core-v2-setup/values.yaml.template

@@ -79,7 +79,6 @@ opentelemetry:
   ratio: 1
 
 hodometer:
-  enabled: true
   image:
     pullPolicy: IfNotPresent
     registry: docker.io