diff --git a/Makefile b/Makefile index 762a65532cc..9ce7cb03e67 100644 --- a/Makefile +++ b/Makefile @@ -319,9 +319,9 @@ endif build-windows: @echo "===> Building Antrea bins and antrea/antrea-windows Docker image <===" ifneq ($(NO_PULL),) - docker build -t antrea/antrea-windows:$(DOCKER_IMG_VERSION) -f build/images/Dockerfile.build.windows $(DOCKER_BUILD_ARGS) . + docker build -t antrea/antrea-windows:$(DOCKER_IMG_VERSION) -f build/images/Dockerfile.build.windows $(DOCKER_BUILD_ARGS) . --network host else - docker build --pull -t antrea/antrea-windows:$(DOCKER_IMG_VERSION) -f build/images/Dockerfile.build.windows $(DOCKER_BUILD_ARGS) . + docker build --pull -t antrea/antrea-windows:$(DOCKER_IMG_VERSION) -f build/images/Dockerfile.build.windows $(DOCKER_BUILD_ARGS) . --network host endif docker tag antrea/antrea-windows:$(DOCKER_IMG_VERSION) antrea/antrea-windows docker tag antrea/antrea-windows:$(DOCKER_IMG_VERSION) projects.registry.vmware.com/antrea/antrea-windows diff --git a/build/images/scripts/Install-WindowsCNI.ps1 b/build/images/scripts/Install-WindowsCNI.ps1 index e85ba3b2bab..282f5e3975c 100644 --- a/build/images/scripts/Install-WindowsCNI.ps1 +++ b/build/images/scripts/Install-WindowsCNI.ps1 @@ -3,7 +3,6 @@ $ErrorActionPreference = "Stop"; mkdir -force /host/var/run/secrets/kubernetes.io/serviceaccount cp -force /var/run/secrets/kubernetes.io/serviceaccount/* /host/var/run/secrets/kubernetes.io/serviceaccount/ mkdir -force /host/k/antrea/etc/ -mkdir -force /host/k/antrea/logs/ cp /k/antrea/cni/* /host/opt/cni/bin/ cp /etc/antrea/antrea-agent.conf /host/k/antrea/etc/ diff --git a/build/yamls/antrea-windows.yml b/build/yamls/antrea-windows.yml index 100e0c7783b..727ced36f96 100644 --- a/build/yamls/antrea-windows.yml +++ b/build/yamls/antrea-windows.yml @@ -5,12 +5,12 @@ data: # wins will rename the binary when executing it. So we need to copy the binary everytime before running it. mkdir -force /host/k/antrea/bin cp /k/antrea/bin/* /host/k/antrea/bin/ - C:/k/antrea/utils/wins.exe cli process run --path /k/antrea/bin/antrea-agent.exe --args "--config=/k/antrea/etc/antrea-agent.conf --logtostderr=false --log_dir=/k/antrea/logs/ --alsologtostderr --log_file_max_size=100 --log_file_max_num=4 --v=0" --envs "KUBERNETES_SERVICE_HOST=$env:KUBERNETES_SERVICE_HOST KUBERNETES_SERVICE_PORT=$env:KUBERNETES_SERVICE_PORT ANTREA_SERVICE_HOST=$env:ANTREA_SERVICE_HOST ANTREA_SERVICE_PORT=$env:ANTREA_SERVICE_PORT NODE_NAME=$env:NODE_NAME KUBE_DNS_SERVICE_HOST=$env:KUBE_DNS_SERVICE_HOST KUBE_DNS_SERVICE_PORT=$env:KUBE_DNS_SERVICE_PORT" + C:/k/antrea/utils/wins.exe cli process run --path /k/antrea/bin/antrea-agent.exe --args "--config=/k/antrea/etc/antrea-agent.conf --logtostderr=false --log_dir=/var/log/antrea/ --alsologtostderr --log_file_max_size=100 --log_file_max_num=4 --v=0" --envs "KUBERNETES_SERVICE_HOST=$env:KUBERNETES_SERVICE_HOST KUBERNETES_SERVICE_PORT=$env:KUBERNETES_SERVICE_PORT ANTREA_SERVICE_HOST=$env:ANTREA_SERVICE_HOST ANTREA_SERVICE_PORT=$env:ANTREA_SERVICE_PORT NODE_NAME=$env:NODE_NAME KUBE_DNS_SERVICE_HOST=$env:KUBE_DNS_SERVICE_HOST KUBE_DNS_SERVICE_PORT=$env:KUBE_DNS_SERVICE_PORT" kind: ConfigMap metadata: labels: app: antrea - name: antrea-agent-windows-d99k4g5264 + name: antrea-agent-windows-kht6m7hthm namespace: kube-system --- apiVersion: v1 @@ -204,6 +204,8 @@ spec: name: antrea-agent-windows - mountPath: /host/k/antrea/ name: host-antrea-home + - mountPath: /host/var/log/antrea/ + name: host-antrea-log hostNetwork: true initContainers: - args: @@ -224,6 +226,8 @@ spec: name: host-cni-bin - mountPath: /host/k/antrea/ name: host-antrea-home + - mountPath: /host/var/log/antrea/ + name: host-antrea-log - mountPath: /host name: host nodeSelector: @@ -241,7 +245,7 @@ spec: name: antrea-windows-config - configMap: defaultMode: 420 - name: antrea-agent-windows-d99k4g5264 + name: antrea-agent-windows-kht6m7hthm name: antrea-agent-windows - hostPath: path: /etc/cni/net.d @@ -255,6 +259,10 @@ spec: path: /k/antrea type: DirectoryOrCreate name: host-antrea-home + - hostPath: + path: /var/log/antrea + type: DirectoryOrCreate + name: host-antrea-log - hostPath: path: / name: host diff --git a/build/yamls/windows/base/agent.yml b/build/yamls/windows/base/agent.yml index dba7d90a85f..c24533fb0f3 100644 --- a/build/yamls/windows/base/agent.yml +++ b/build/yamls/windows/base/agent.yml @@ -45,6 +45,8 @@ spec: name: antrea-agent-windows - mountPath: /host/k/antrea/ name: host-antrea-home + - mountPath: /host/var/log/antrea/ + name: host-antrea-log hostNetwork: true initContainers: - command: @@ -64,6 +66,8 @@ spec: name: host-cni-bin - mountPath: /host/k/antrea/ name: host-antrea-home + - mountPath: /host/var/log/antrea/ + name: host-antrea-log - mountPath: /host name: host nodeSelector: @@ -95,6 +99,10 @@ spec: path: /k/antrea type: DirectoryOrCreate name: host-antrea-home + - hostPath: + path: /var/log/antrea + type: DirectoryOrCreate + name: host-antrea-log - hostPath: path: / name: host diff --git a/build/yamls/windows/base/conf/Run-AntreaAgent.ps1 b/build/yamls/windows/base/conf/Run-AntreaAgent.ps1 index 34ca44d9737..948645e2e1b 100644 --- a/build/yamls/windows/base/conf/Run-AntreaAgent.ps1 +++ b/build/yamls/windows/base/conf/Run-AntreaAgent.ps1 @@ -2,4 +2,4 @@ $ErrorActionPreference = "Stop" # wins will rename the binary when executing it. So we need to copy the binary everytime before running it. mkdir -force /host/k/antrea/bin cp /k/antrea/bin/* /host/k/antrea/bin/ -C:/k/antrea/utils/wins.exe cli process run --path /k/antrea/bin/antrea-agent.exe --args "--config=/k/antrea/etc/antrea-agent.conf --logtostderr=false --log_dir=/k/antrea/logs/ --alsologtostderr --log_file_max_size=100 --log_file_max_num=4 --v=0" --envs "KUBERNETES_SERVICE_HOST=$env:KUBERNETES_SERVICE_HOST KUBERNETES_SERVICE_PORT=$env:KUBERNETES_SERVICE_PORT ANTREA_SERVICE_HOST=$env:ANTREA_SERVICE_HOST ANTREA_SERVICE_PORT=$env:ANTREA_SERVICE_PORT NODE_NAME=$env:NODE_NAME KUBE_DNS_SERVICE_HOST=$env:KUBE_DNS_SERVICE_HOST KUBE_DNS_SERVICE_PORT=$env:KUBE_DNS_SERVICE_PORT" +C:/k/antrea/utils/wins.exe cli process run --path /k/antrea/bin/antrea-agent.exe --args "--config=/k/antrea/etc/antrea-agent.conf --logtostderr=false --log_dir=/var/log/antrea/ --alsologtostderr --log_file_max_size=100 --log_file_max_num=4 --v=0" --envs "KUBERNETES_SERVICE_HOST=$env:KUBERNETES_SERVICE_HOST KUBERNETES_SERVICE_PORT=$env:KUBERNETES_SERVICE_PORT ANTREA_SERVICE_HOST=$env:ANTREA_SERVICE_HOST ANTREA_SERVICE_PORT=$env:ANTREA_SERVICE_PORT NODE_NAME=$env:NODE_NAME KUBE_DNS_SERVICE_HOST=$env:KUBE_DNS_SERVICE_HOST KUBE_DNS_SERVICE_PORT=$env:KUBE_DNS_SERVICE_PORT" diff --git a/hack/windows/Helper.psm1 b/hack/windows/Helper.psm1 index 09d0b7f3dc6..7f6ac33710e 100644 --- a/hack/windows/Helper.psm1 +++ b/hack/windows/Helper.psm1 @@ -262,7 +262,7 @@ function Start-AntreaAgent { $AntreaAgent = "$AntreaHome\bin\antrea-agent.exe" $AntreaAgentConfigPath = "$AntreaHome\etc\antrea-agent.conf" if ($LogDir -eq "") { - $LogDir = "$AntreaHome\logs" + $LogDir = "c:\var\log\antrea" } New-DirectoryIfNotExist $LogDir [Environment]::SetEnvironmentVariable("NODE_NAME", (hostname).ToLower()) diff --git a/pkg/util/logdir/logdir_windows.go b/pkg/util/logdir/logdir_windows.go index 341b8ff8300..2b4003c05b9 100644 --- a/pkg/util/logdir/logdir_windows.go +++ b/pkg/util/logdir/logdir_windows.go @@ -17,4 +17,4 @@ package logdir -const antreaWellKnownLogDir = `C:\k\antrea\logs` +const antreaWellKnownLogDir = `C:\var\log\antrea`