Skip to content

Commit

Permalink
fix: let Windows CNS use the InClusterConfig
Browse files Browse the repository at this point in the history
Signed-off-by: Evan Baker <[email protected]>
  • Loading branch information
rbtr authored Dec 6, 2024
1 parent 4442e51 commit b219bb3
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 8 deletions.
2 changes: 0 additions & 2 deletions cns/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ EXPOSE 10090

# skopeo inspect docker://mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0 --format "{{.Name}}@{{.Digest}}"
FROM mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b as windows
COPY --from=builder /azure-container-networking/cns/kubeconfigtemplate.yaml kubeconfigtemplate.yaml
COPY --from=builder /azure-container-networking/npm/examples/windows/setkubeconfigpath.ps1 setkubeconfigpath.ps1
COPY --from=builder /go/bin/azure-cns /azure-cns.exe
ENTRYPOINT ["azure-cns.exe"]
EXPOSE 10090
2 changes: 0 additions & 2 deletions cns/azure-cns-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,12 @@ spec:
command: ["powershell.exe"]
args:
[
'.\setkubeconfigpath.ps1', ";",
'powershell.exe', '.\azure-cns.exe',
'-c', "tcp://$(CNSIpAddress):$(CNSPort)",
'-t', "$(CNSLogTarget)",
'-o', "$(CNSLogDir)",
'-storefilepath', "$(CNSStoreFilePath)",
'-config-path', "%CONTAINER_SANDBOX_MOUNT_POINT%\\$(CNS_CONFIGURATION_PATH)",
'--kubeconfig', '.\kubeconfig',
]
volumeMounts:
- name: log
Expand Down
4 changes: 0 additions & 4 deletions test/integration/manifests/cns/daemonset-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ spec:
command: ["powershell.exe"]
args:
[
'.\setkubeconfigpath.ps1',
";",
'.\azure-cns.exe',
"-c",
"tcp://$(CNSIpAddress):$(CNSPort)",
Expand All @@ -65,8 +63,6 @@ spec:
"$(CNSStoreFilePath)",
"-config-path",
"%CONTAINER_SANDBOX_MOUNT_POINT%\\$(CNS_CONFIGURATION_PATH)",
"--kubeconfig",
'.\kubeconfig',
]
volumeMounts:
- name: log
Expand Down

0 comments on commit b219bb3

Please sign in to comment.