From 1e47d96d5a0d6fc595b3f5f4e784889fe4989343 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Tue, 4 Jul 2023 20:55:50 +0200 Subject: [PATCH 1/3] Add log files for felix and calico Signed-off-by: Manuel Buil --- pkg/windows/calico.go | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkg/windows/calico.go b/pkg/windows/calico.go index 30b9eee1aa..d0e4103f15 100644 --- a/pkg/windows/calico.go +++ b/pkg/windows/calico.go @@ -125,6 +125,7 @@ const ( CalicoSystemNamespace = "calico-system" CalicoChart = "rke2-calico" calicoNode = "calico-node" + calicoLogPath = "C:\\var\\log\\" ) // Setup creates the basic configuration required by the CNI. @@ -373,6 +374,12 @@ func (c *Calico) overrideCalicoConfigByHelm(restConfig *rest.Config) error { } func startFelix(ctx context.Context, config *CalicoConfig) { + outputFile, err := os.Create(calicoLogPath + "felix.log") + if err != nil { + logrus.Fatalf("error creating felix.log: %v", err) + return + } + defer outputFile.Close() specificEnvs := []string{ fmt.Sprintf("FELIX_FELIXHOSTNAME=%s", config.Hostname), fmt.Sprintf("FELIX_VXLANVNI=%s", config.Felix.Vxlanvni), @@ -386,14 +393,19 @@ func startFelix(ctx context.Context, config *CalicoConfig) { logrus.Infof("Felix Envs: %s", append(generateGeneralCalicoEnvs(config), specificEnvs...)) cmd := exec.CommandContext(ctx, "calico-node.exe", args...) cmd.Env = append(generateGeneralCalicoEnvs(config), specificEnvs...) - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - if err := cmd.Run(); err != nil { - logrus.Errorf("Felix exited: %v", err) - } + cmd.Stdout = outputFile + cmd.Stderr = outputFile + _ = cmd.Run() + logrus.Error("Felix exited") } func startCalico(ctx context.Context, config *CalicoConfig) error { + outputFile, err := os.Create(calicoLogPath + "calico-node.log") + if err != nil { + logrus.Errorf("error creating calico-node.log: %v", err) + return err + } + defer outputFile.Close() specificEnvs := []string{ fmt.Sprintf("CALICO_NODENAME_FILE=%s", config.NodeNameFile), } @@ -404,8 +416,8 @@ func startCalico(ctx context.Context, config *CalicoConfig) error { logrus.Infof("Calico Envs: %s", append(generateGeneralCalicoEnvs(config), specificEnvs...)) cmd := exec.CommandContext(ctx, "calico-node.exe", args...) cmd.Env = append(generateGeneralCalicoEnvs(config), specificEnvs...) - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr + cmd.Stdout = outputFile + cmd.Stderr = outputFile if err := cmd.Run(); err != nil { logrus.Errorf("Calico exited: %v", err) return err From 01660b722c6595a25dbf216d7fad8b1e00a16743 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Fri, 7 Jul 2023 11:11:31 +0200 Subject: [PATCH 2/3] Update multus version Signed-off-by: Manuel Buil --- Dockerfile | 2 +- scripts/build-images | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9dd8915730..111d710bc8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,7 +112,7 @@ RUN CHART_VERSION="v3.25.002" CHART_FILE=/charts/rke2-calico-crd RUN CHART_VERSION="1.24.004" CHART_FILE=/charts/rke2-coredns.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="4.6.100" CHART_FILE=/charts/rke2-ingress-nginx.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh RUN CHART_VERSION="2.11.100-build2023051509" CHART_FILE=/charts/rke2-metrics-server.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh -RUN CHART_VERSION="v3.9.3-build2023010903" CHART_FILE=/charts/rke2-multus.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh +RUN CHART_VERSION="v4.0.2-build2023070701" CHART_FILE=/charts/rke2-multus.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="1.5.100" CHART_FILE=/charts/rancher-vsphere-cpi.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="3.0.1-rancher101" CHART_FILE=/charts/rancher-vsphere-csi.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="0.2.200" CHART_FILE=/charts/harvester-cloud-provider.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh diff --git a/scripts/build-images b/scripts/build-images index 02dfa525ba..6b0c1acf68 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -71,7 +71,7 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-vsphere.txt EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt - ${REGISTRY}/rancher/hardened-multus-cni:v3.9.3-build20230109 + ${REGISTRY}/rancher/hardened-multus-cni:v4.0.2-build20230707 ${REGISTRY}/rancher/hardened-cni-plugins:v1.2.0-build20230523 ${REGISTRY}/rancher/hardened-sriov-network-operator:v1.2.0-build20230607 ${REGISTRY}/rancher/hardened-sriov-network-config-daemon:v1.2.0-build20230607 From 31cf4e33c72d6d4cc70a032f8ef6d62d530853d7 Mon Sep 17 00:00:00 2001 From: Roberto Bonafiglia Date: Fri, 7 Jul 2023 10:34:13 +0200 Subject: [PATCH 3/3] Update Calico to v3.26.1 Signed-off-by: Roberto Bonafiglia --- Dockerfile | 4 ++-- Dockerfile.windows | 4 ++-- scripts/build-images | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9dd8915730..e040316d2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -107,8 +107,8 @@ COPY charts/ /charts/ RUN echo ${CACHEBUST}>/dev/null RUN CHART_VERSION="1.13.200" CHART_FILE=/charts/rke2-cilium.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="v3.25.1-build2023051202" CHART_FILE=/charts/rke2-canal.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh -RUN CHART_VERSION="v3.25.002" CHART_FILE=/charts/rke2-calico.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh -RUN CHART_VERSION="v3.25.002" CHART_FILE=/charts/rke2-calico-crd.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh +RUN CHART_VERSION="v3.26.100" CHART_FILE=/charts/rke2-calico.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh +RUN CHART_VERSION="v3.26.100" CHART_FILE=/charts/rke2-calico-crd.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="1.24.004" CHART_FILE=/charts/rke2-coredns.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="4.6.100" CHART_FILE=/charts/rke2-ingress-nginx.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh RUN CHART_VERSION="2.11.100-build2023051509" CHART_FILE=/charts/rke2-metrics-server.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh diff --git a/Dockerfile.windows b/Dockerfile.windows index ffe0323b79..f361f6200e 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -43,8 +43,8 @@ FROM build as windows-runtime-collect ARG KUBERNETES_VERSION=dev # windows runtime image -ENV CRICTL_VERSION="v1.25.0" -ENV CALICO_VERSION="v3.25.0" +ENV CRICTL_VERSION="v1.27.0" +ENV CALICO_VERSION="v3.26.1" ENV CNI_PLUGIN_VERSION="v1.1.1" RUN mkdir -p rancher diff --git a/scripts/build-images b/scripts/build-images index 02dfa525ba..d6495c3d3b 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -49,14 +49,14 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-calico.txt - ${REGISTRY}/rancher/mirrored-calico-operator:v1.29.0 - ${REGISTRY}/rancher/mirrored-calico-ctl:v3.25.0 - ${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.25.0 - ${REGISTRY}/rancher/mirrored-calico-typha:v3.25.0 - ${REGISTRY}/rancher/mirrored-calico-node:v3.25.0 - ${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.25.0 - ${REGISTRY}/rancher/mirrored-calico-cni:v3.25.0 - ${REGISTRY}/rancher/mirrored-calico-apiserver:v3.25.0 + ${REGISTRY}/rancher/mirrored-calico-operator:v1.30.4 + ${REGISTRY}/rancher/mirrored-calico-ctl:v3.26.1 + ${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.26.1 + ${REGISTRY}/rancher/mirrored-calico-typha:v3.26.1 + ${REGISTRY}/rancher/mirrored-calico-node:v3.26.1 + ${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.26.1 + ${REGISTRY}/rancher/mirrored-calico-cni:v3.26.1 + ${REGISTRY}/rancher/mirrored-calico-apiserver:v3.26.1 EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-vsphere.txt