diff --git a/deploy/hubble/manifests/controller/helm/retina/templates/agent/configmap.yaml b/deploy/hubble/manifests/controller/helm/retina/templates/agent/configmap.yaml index 704cf5a9c5..0dd67890c4 100644 --- a/deploy/hubble/manifests/controller/helm/retina/templates/agent/configmap.yaml +++ b/deploy/hubble/manifests/controller/helm/retina/templates/agent/configmap.yaml @@ -132,7 +132,7 @@ data: metricsInterval: {{ .Values.metricsInterval }} metricsIntervalDuration: {{ .Values.metricsIntervalDuration }} enableTelemetry: {{ .Values.enableTelemetry }} - enablePodLevel: {{ .Values.enablePodLevel }} + enablePodLevel: false remoteContext: {{ .Values.remoteContext }} bypassLookupIPOfInterest: {{ .Values.bypassLookupIPOfInterest }} {{- end}} diff --git a/deploy/hubble/manifests/controller/helm/retina/values.yaml b/deploy/hubble/manifests/controller/helm/retina/values.yaml index 0717e0b500..5d93b8e6e3 100644 --- a/deploy/hubble/manifests/controller/helm/retina/values.yaml +++ b/deploy/hubble/manifests/controller/helm/retina/values.yaml @@ -90,7 +90,7 @@ logLevel: info enabledPlugin_linux: '["linuxutil","packetforward","packetparser","dns", "dropreason"]' enabledPlugin_win: '["hnsstats"]' -enableTelemetry: true +enableTelemetry: false # Interval, in duration, to scrape/publish metrics. metricsIntervalDuration: "10s" diff --git a/deploy/legacy/manifests/controller/helm/retina/templates/daemonset.yaml b/deploy/legacy/manifests/controller/helm/retina/templates/daemonset.yaml index f4e44332e0..f222ccc2fa 100644 --- a/deploy/legacy/manifests/controller/helm/retina/templates/daemonset.yaml +++ b/deploy/legacy/manifests/controller/helm/retina/templates/daemonset.yaml @@ -203,7 +203,13 @@ spec: containerPort: {{ .Values.retinaPort }} workingDir: $env:CONTAINER_SANDBOX_MOUNT_POINT command: - - controller.exe --config ./retina/config.yaml + - powershell.exe + - -command + {{- if semverCompare ">=1.28" .Capabilities.KubeVersion.GitVersion }} + - $env:CONTAINER_SANDBOX_MOUNT_POINT/controller.exe --config ./retina/config.yaml + {{- else }} + - .\setkubeconfigpath.ps1; ./controller.exe --config ./retina/config.yaml --kubeconfig ./kubeconfig + {{- end }} env: - name: POD_NAME valueFrom: diff --git a/windows/kubeconfigtemplate.yaml b/windows/kubeconfigtemplate.yaml index 21a6c054f2..49e6c8ad50 100644 --- a/windows/kubeconfigtemplate.yaml +++ b/windows/kubeconfigtemplate.yaml @@ -9,7 +9,7 @@ contexts: - name: azure-retina-windows@kubernetes context: cluster: kubernetes - namespace: {{ .Values.namespace }} + namespace: kube-system user: azure-retina-windows current-context: azure-retina-windows@kubernetes users: diff --git a/windows/manifests/windows.yaml b/windows/manifests/windows.yaml index 4fd7cb2d5a..62c78ba49c 100644 --- a/windows/manifests/windows.yaml +++ b/windows/manifests/windows.yaml @@ -4,7 +4,7 @@ metadata: labels: app: retina name: retina-win - namespace: {{ .Values.namespace }} + namespace: kube-system annotations: prometheus.io/port: "10093" prometheus.io/scrape: "true" @@ -62,7 +62,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: retina-config-win - namespace: {{ .Values.namespace }} + namespace: kube-system data: config.yaml: |- apiServer: