diff --git a/deploy/legacy/manifests/controller/helm/retina/templates/daemonset.yaml b/deploy/legacy/manifests/controller/helm/retina/templates/daemonset.yaml index 7667aac2793..f222ccc2fa5 100644 --- a/deploy/legacy/manifests/controller/helm/retina/templates/daemonset.yaml +++ b/deploy/legacy/manifests/controller/helm/retina/templates/daemonset.yaml @@ -205,7 +205,11 @@ spec: command: - 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/go.mod b/go.mod index 51bfedd38b5..31da1e4af04 100644 --- a/go.mod +++ b/go.mod @@ -321,6 +321,12 @@ require ( go.opentelemetry.io/otel v1.33.0 go.opentelemetry.io/otel/metric v1.33.0 go.opentelemetry.io/otel/trace v1.33.0 +<<<<<<< Updated upstream +======= + go.opentelemetry.io/otel v1.33.0 + go.opentelemetry.io/otel/metric v1.33.0 + go.opentelemetry.io/otel/trace v1.33.0 +>>>>>>> Stashed changes go.uber.org/mock v0.5.0 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 google.golang.org/grpc v1.66.2