Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rke2 for openSUSE:Factory checked in at 2023-08-02 16:49:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rke2 (Old) and /work/SRC/openSUSE:Factory/.rke2.new.22712 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rke2" Wed Aug 2 16:49:17 2023 rev:7 rq:1101741 version:1.27.4+rke2r1 Changes: -------- --- /work/SRC/openSUSE:Factory/rke2/rke2.changes 2023-06-29 17:28:55.950471660 +0200 +++ /work/SRC/openSUSE:Factory/.rke2.new.22712/rke2.changes 2023-08-02 16:51:00.989706872 +0200 @@ -1,0 +2,9 @@ +Tue Aug 1 13:05:26 UTC 2023 - Johannes Kastl <ka...@b1-systems.de> + +- Update to version 1.27.4+rke2r1: + * This release updates Kubernetes to v1.27.4, and fixes a number + of issues. + * Details see + https://github.com/rancher/rke2/releases/tag/v1.27.4+rke2r1 + +------------------------------------------------------------------- Old: ---- rke2-1.27.3+rke2r1.tar.gz New: ---- rke2-1.27.4+rke2r1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rke2.spec ++++++ --- /var/tmp/diff_new_pack.nlyBNk/_old 2023-08-02 16:51:02.761717578 +0200 +++ /var/tmp/diff_new_pack.nlyBNk/_new 2023-08-02 16:51:02.765717602 +0200 @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: rke2 -Version: 1.27.3+rke2r1 +Version: 1.27.4+rke2r1 Release: 0 Summary: Rancher Kubernetes Engine License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.nlyBNk/_old 2023-08-02 16:51:02.809717868 +0200 +++ /var/tmp/diff_new_pack.nlyBNk/_new 2023-08-02 16:51:02.809717868 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/rancher/rke2</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v1.27.3+rke2r1</param> + <param name="revision">v1.27.4+rke2r1</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">disable</param> <param name="versionrewrite-pattern">v(.*)</param> @@ -16,7 +16,7 @@ <param name="compression">gz</param> </service> <service name="go_modules" mode="disabled"> - <param name="archive">rke2-1.27.3+rke2r1.tar.gz</param> + <param name="archive">rke2-1.27.4+rke2r1.tar.gz</param> </service> </services> ++++++ rke2-1.27.3+rke2r1.tar.gz -> rke2-1.27.4+rke2r1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.27.3+rke2r1/.drone.yml new/rke2-1.27.4+rke2r1/.drone.yml --- old/rke2-1.27.3+rke2r1/.drone.yml 2023-06-21 01:39:04.000000000 +0200 +++ new/rke2-1.27.4+rke2r1/.drone.yml 2023-07-20 00:38:47.000000000 +0200 @@ -7,6 +7,9 @@ os: linux arch: amd64 +clone: + retries: 3 + steps: - name: skipfiles image: plugins/git @@ -206,6 +209,9 @@ os: linux arch: arm64 +clone: + retries: 3 + steps: - name: skipfiles image: plugins/git @@ -371,6 +377,9 @@ node: arch: s390x +clone: + retries: 3 + steps: - name: skipfiles image: alpine/git:v2.30.2-s390x @@ -474,6 +483,9 @@ os: linux arch: amd64 +clone: + retries: 3 + steps: - name: skipfiles image: plugins/git @@ -532,6 +544,9 @@ os: linux arch: amd64 +clone: + retries: 3 + steps: - name: skipfiles image: plugins/git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.27.3+rke2r1/.github/workflows/nightly-install.yaml new/rke2-1.27.4+rke2r1/.github/workflows/nightly-install.yaml --- old/rke2-1.27.3+rke2r1/.github/workflows/nightly-install.yaml 2023-06-21 01:39:04.000000000 +0200 +++ new/rke2-1.27.4+rke2r1/.github/workflows/nightly-install.yaml 2023-07-20 00:38:47.000000000 +0200 @@ -13,7 +13,7 @@ fail-fast: false matrix: channel: [stable] - vm: [centos-7, rocky-8, opensuse-microos, ubuntu-focal, windows-2019, windows-2022] + vm: [centos-7, rocky-8, opensuse-microos, opensuse-leap, ubuntu-focal, windows-2019, windows-2022] include: - {channel: latest, vm: rocky-8} - {channel: latest, vm: ubuntu-focal} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.27.3+rke2r1/Dockerfile new/rke2-1.27.4+rke2r1/Dockerfile --- old/rke2-1.27.3+rke2r1/Dockerfile 2023-06-21 01:39:04.000000000 +0200 +++ new/rke2-1.27.4+rke2r1/Dockerfile 2023-07-20 00:38:47.000000000 +0200 @@ -106,13 +106,13 @@ 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.25.1-build2023051203" CHART_FILE=/charts/rke2-canal.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.5.202" CHART_FILE=/charts/rke2-ingress-nginx.yaml CHART_BOOTSTRAP=false /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 @@ -126,7 +126,7 @@ # This image includes any host level programs that we might need. All binaries # must be placed in bin/ of the file image and subdirectories of bin/ will be flattened during installation. # This means bin/foo/bar will become bin/bar when rke2 installs this to the host -FROM rancher/hardened-kubernetes:v1.27.3-rke2r1-build20230614 AS kubernetes +FROM rancher/hardened-kubernetes:v1.27.4-rke2r1-build20230719 AS kubernetes FROM rancher/hardened-containerd:v1.7.1-k3s1-build20230606 AS containerd FROM rancher/hardened-crictl:v1.26.1-build20230606 AS crictl FROM rancher/hardened-runc:v1.1.7-build20230606 AS runc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.27.3+rke2r1/Dockerfile.windows new/rke2-1.27.4+rke2r1/Dockerfile.windows --- old/rke2-1.27.3+rke2r1/Dockerfile.windows 2023-06-21 01:39:04.000000000 +0200 +++ new/rke2-1.27.4+rke2r1/Dockerfile.windows 2023-07-20 00:38:47.000000000 +0200 @@ -43,8 +43,8 @@ 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 @@ -95,7 +95,9 @@ RUN mv CalicoWindows/calico-node.exe rancher/ RUN mv CalicoWindows/cni/calico.exe rancher/ RUN mv CalicoWindows/cni/calico-ipam.exe rancher/ +RUN mv CalicoWindows/confd confd/ FROM scratch AS windows-runtime COPY --from=containerd /usr/local/bin/*.exe /bin/ COPY --from=windows-runtime-collect ./rancher/* /bin/ +COPY --from=windows-runtime-collect ./confd/ /bin/confd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.27.3+rke2r1/channels.yaml new/rke2-1.27.4+rke2r1/channels.yaml --- old/rke2-1.27.3+rke2r1/channels.yaml 2023-06-21 01:39:04.000000000 +0200 +++ new/rke2-1.27.4+rke2r1/channels.yaml 2023-07-20 00:38:47.000000000 +0200 @@ -1,6 +1,6 @@ channels: - name: stable - latest: v1.25.10+rke2r1 + latest: v1.25.11+rke2r1 - name: latest latestRegexp: .* excludeRegexp: (^[^+]+-|v1\.25\.5\+rke2r1|v1\.26\.0\+rke2r1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.27.3+rke2r1/go.mod new/rke2-1.27.4+rke2r1/go.mod --- old/rke2-1.27.3+rke2r1/go.mod 2023-06-21 01:39:04.000000000 +0200 +++ new/rke2-1.27.4+rke2r1/go.mod 2023-07-20 00:38:47.000000000 +0200 @@ -50,39 +50,39 @@ google.golang.org/genproto => google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 google.golang.org/grpc => google.golang.org/grpc v1.51.0 gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.6.0 - k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.27.2-k3s1 - k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.27.2-k3s1 - k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.27.2-k3s1 - k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.27.2-k3s1 - k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.27.2-k3s1 - k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.27.2-k3s1 - k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.27.2-k3s1 - k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.27.2-k3s1 - k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.27.2-k3s1 - k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.27.2-k3s1 - k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.27.2-k3s1 - k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.27.2-k3s1 - k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.27.2-k3s1 - k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.27.2-k3s1 - k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.27.2-k3s1 + k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.27.3-k3s1 + k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.27.3-k3s1 + k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.27.3-k3s1 + k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.27.3-k3s1 + k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.27.3-k3s1 + k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.27.3-k3s1 + k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.27.3-k3s1 + k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.27.3-k3s1 + k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.27.3-k3s1 + k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.27.3-k3s1 + k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.27.3-k3s1 + k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.27.3-k3s1 + k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.27.3-k3s1 + k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.27.3-k3s1 + k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.27.3-k3s1 k8s.io/klog => github.com/k3s-io/klog v1.0.0-k3s2 // k3s-release-1.x k8s.io/klog/v2 => github.com/k3s-io/klog/v2 v2.90.1-k3s1 // k3s-main - k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.27.2-k3s1 - k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.27.2-k3s1 - k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.27.2-k3s1 - k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.27.2-k3s1 - k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.27.2-k3s1 - k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.27.2-k3s1 - k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.27.2-k3s1 - k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.27.2-k3s1 - k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.27.2-k3s1 - k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.27.2-k3s1 - k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.27.2-k3s1 - k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.27.2-k3s1 - k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.27.2-k3s1 - k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.27.2-k3s1 - k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.27.2-k3s1 - k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.27.2-k3s1 + k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.27.3-k3s1 + k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.27.3-k3s1 + k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.27.3-k3s1 + k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.27.3-k3s1 + k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.27.3-k3s1 + k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.27.3-k3s1 + k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.27.3-k3s1 + k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.27.3-k3s1 + k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.27.3-k3s1 + k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.27.3-k3s1 + k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.27.3-k3s1 + k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.27.3-k3s1 + k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.27.3-k3s1 + k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.27.3-k3s1 + k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.27.3-k3s1 + k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.27.3-k3s1 mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 ) @@ -92,8 +92,8 @@ github.com/containerd/continuity v0.3.0 // indirect github.com/google/go-containerregistry v0.12.2-0.20230106184643-b063f6aeac72 github.com/iamacarpet/go-win64api v0.0.0-20210311141720-fe38760bed28 - github.com/k3s-io/helm-controller v0.15.0 - github.com/k3s-io/k3s v1.27.3-0.20230612175249-b66a118362ba // master + github.com/k3s-io/helm-controller v0.15.2 + github.com/k3s-io/k3s v1.27.4-0.20230707183357-2eddfe6cf4e6 // master github.com/libp2p/go-netroute v0.2.0 github.com/natefinch/lumberjack v2.0.0+incompatible github.com/onsi/ginkgo/v2 v2.9.4 @@ -110,14 +110,14 @@ golang.org/x/sync v0.1.0 golang.org/x/sys v0.7.0 google.golang.org/grpc v1.53.0 - k8s.io/api v0.27.2 - k8s.io/apimachinery v0.27.2 - k8s.io/apiserver v0.27.2 + k8s.io/api v0.27.3 + k8s.io/apimachinery v0.27.3 + k8s.io/apiserver v0.27.3 k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible - k8s.io/component-base v0.27.2 - k8s.io/cri-api v0.27.2 + k8s.io/component-base v0.27.3 + k8s.io/cri-api v0.27.3 k8s.io/klog/v2 v2.90.1 - k8s.io/kubernetes v1.27.2 + k8s.io/kubernetes v1.27.3 k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 sigs.k8s.io/yaml v1.3.0 ) @@ -369,9 +369,9 @@ honnef.co/go/tools v0.2.2 // indirect inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 // indirect k8s.io/apiextensions-apiserver v0.25.4 // indirect - k8s.io/cloud-provider v0.27.2 // indirect + k8s.io/cloud-provider v0.27.3 // indirect k8s.io/cluster-bootstrap v0.0.0 // indirect - k8s.io/component-helpers v0.27.2 // indirect + k8s.io/component-helpers v0.27.3 // indirect k8s.io/controller-manager v0.25.4 // indirect k8s.io/csi-translation-lib v0.0.0 // indirect k8s.io/dynamic-resource-allocation v0.0.0 // indirect @@ -385,7 +385,7 @@ k8s.io/kubelet v0.0.0 // indirect k8s.io/legacy-cloud-providers v0.0.0 // indirect k8s.io/metrics v0.0.0 // indirect - k8s.io/mount-utils v0.27.2 // indirect + k8s.io/mount-utils v0.27.3 // indirect k8s.io/pod-security-admission v0.0.0 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect sigs.k8s.io/controller-runtime v0.10.1 // indirect diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.27.3+rke2r1/go.sum new/rke2-1.27.4+rke2r1/go.sum --- old/rke2-1.27.3+rke2r1/go.sum 2023-06-21 01:39:04.000000000 +0200 +++ new/rke2-1.27.4+rke2r1/go.sum 2023-07-20 00:38:47.000000000 +0200 @@ -851,10 +851,10 @@ github.com/k3s-io/etcd/raft/v3 v3.5.7-k3s1/go.mod h1:TflkAb/8Uy6JFBxcRaH2Fr6Slm9mCPVdI2efzxY96yU= github.com/k3s-io/etcd/server/v3 v3.5.7-k3s1 h1:T4VGL9jq4WvxAd7Jiilt7f3ZBPkqPTqa0GZD9t5j50A= github.com/k3s-io/etcd/server/v3 v3.5.7-k3s1/go.mod h1:gxBgT84issUVBRpZ3XkW1T55NjOb4vZZRI4wVvNhf4A= -github.com/k3s-io/helm-controller v0.15.0 h1:ZKpgkq4TX/EAebCoJhPfGRF7w1F8Kz1Kb4ugbkKZoic= -github.com/k3s-io/helm-controller v0.15.0/go.mod h1:BgCPBQblj/Ect4Q7/Umf86WvyDjdG/34D+n8wfXtoeM= -github.com/k3s-io/k3s v1.27.3-0.20230612175249-b66a118362ba h1:OWnIuW4gYGZNq2xoMThH59POBCBt8WxrfdzoJdQ9940= -github.com/k3s-io/k3s v1.27.3-0.20230612175249-b66a118362ba/go.mod h1:CKIK6Wr3liDne5+uUKwg2nowpbgfp4Crnw2E6qUUrxk= +github.com/k3s-io/helm-controller v0.15.2 h1:H5OWiNPhp9ZoyZOldt0ewq7wTy4UnU9j7DHdb7swi0Q= +github.com/k3s-io/helm-controller v0.15.2/go.mod h1:BgCPBQblj/Ect4Q7/Umf86WvyDjdG/34D+n8wfXtoeM= +github.com/k3s-io/k3s v1.27.4-0.20230707183357-2eddfe6cf4e6 h1:J4tqpuQLvpe2WZT63nVQIEuTkajkRt+G9Bh4ibkIREE= +github.com/k3s-io/k3s v1.27.4-0.20230707183357-2eddfe6cf4e6/go.mod h1:ctmq7hCsSiF6cWWv3vA9OaT3J4C3SfeXGPWdwxRwIu0= github.com/k3s-io/kine v0.10.1 h1:HdpG84WaZvIYYzFB+kT8grNhtlsGzLLYN/MohV+r7+U= github.com/k3s-io/kine v0.10.1/go.mod h1:TU8mr4oByeEPKChQBUpSdGc1mZk+Txr2yZhRY+Jch1Q= github.com/k3s-io/klog v1.0.0-k3s2/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= @@ -862,57 +862,57 @@ github.com/k3s-io/klog/v2 v2.90.1-k3s1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= github.com/k3s-io/kube-router/v2 v2.0.1-0.20230508174102-b42e5faded1c h1:7IaKAByGXNvZAmhYlaHH2LiqOGWtPNVg8vKV1Xvlrek= github.com/k3s-io/kube-router/v2 v2.0.1-0.20230508174102-b42e5faded1c/go.mod h1:zhLSRTL1M+0BqeDTRzT42ZtlFJH/d9xaGvXGQR4c2Gc= -github.com/k3s-io/kubernetes v1.27.2-k3s1 h1:Z4dvj7HvIGrIbQRHdIevZnBifl3bFD8ehJfmbVld0lE= -github.com/k3s-io/kubernetes v1.27.2-k3s1/go.mod h1:U8ZXeKBAPxeb4J4/HOaxjw1A9K6WfSH+fY2SS7CR6IM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.27.2-k3s1 h1:QlOqFCCZ9MFR6M05TUpGtE83WJUK3Q0VHoYyY1OOLDc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.27.2-k3s1/go.mod h1:BkLIWuLYarkyXCgyBapJTaVKh6Y6dtizkSS6yaOw90A= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.27.2-k3s1 h1:ue8/FGmuoVf6CzlS+cZev1SRiD+NQnw5q6PyMBsN4Pg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.27.2-k3s1/go.mod h1:zSDJGTKUDaXJ9QVqPPhOdv4Mc4o9sRF2kHG+8CariCg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.27.2-k3s1 h1:k+scylONIlB9jwl2DT0hy2uC8ht4XlXma/ORuq4b+NA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.27.2-k3s1/go.mod h1:Osfbq0FOlZe3tVCZPzx7nqzX6fBVrXwQbLq5+63kKzU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.27.2-k3s1 h1:Q9wSvJfkENM0zf5xyRiBvCYKvslmsPyvxltyrdhldeQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.27.2-k3s1/go.mod h1:F8MLr0HHTdIguLLfPPPfHjSHnFfxxT+g9VN+SXnAz30= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.27.2-k3s1 h1:l8xnU+e8br0Z6BBzEaR6HXNN7tWWfHuY6ah5Yceu5QQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.27.2-k3s1/go.mod h1:imCCbwtdkqQq1e48br+TMMKRQWA1b2dcnb3yuAZRQ0E= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.27.2-k3s1 h1:7OnGNNY0wgMdSYtZ/q3o3ImDt7LhBvn5UQOIyxWIcxE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.27.2-k3s1/go.mod h1:KDPXcl6hV3rFC8wffq2cNbO7epPc7usxhER/5g4Cc+w= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.27.2-k3s1 h1:CcuEcEZOAeHgxg4dttDhOVfIv3EGxjy/1MDItd2StjU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.27.2-k3s1/go.mod h1:IcPB/5jKQQI4ebDXsQigmOZIiAqlwgtQvIzmxHy3pGQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.27.2-k3s1/go.mod h1:0dF6zBk2bqVelXoKV8HzTSqggL8VwRWGT1IyJ2VmCbs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.27.2-k3s1 h1:KKlxtHroX6+sD69WQV3FD4fD7Rd9b3mcOOAonVSM7g4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.27.2-k3s1/go.mod h1:J1XjMts5nmpmjnMkgWENknKJZz5XvN82A7S1AJ4qCZ0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.27.2-k3s1 h1:3fiPNphBdJsHdFdBMKlHzTlnQ8tuGO/HG5SspEZoC7k= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.27.2-k3s1/go.mod h1:XH/mT02C+kohuNtjlyY/eSIUIKuaeiNC3wX9xkcRW+s= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.27.2-k3s1 h1:HEd0QgQxwsgrEATm6Ehpzx8d6MOZeHbIUu7hcRKqCCk= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.27.2-k3s1/go.mod h1:OhS2nNvxcwT4yrlk1UZL6pJsonPhxwlTLioArEyEDRQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.27.2-k3s1 h1:jDysp9LdywMOrhu2Epmxon6k8vQiHr8ihJIG9qUUdnI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.27.2-k3s1/go.mod h1:P3jQ0JFCbQmHTNdnpQ6+rgpBvHW5jRJdpY13LRFk9MY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.27.2-k3s1 h1:pBbsGh5PLk1YyE48O7i4Ytf/L2obXO6uV0crAgNpkNQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.27.2-k3s1/go.mod h1:5/8Rts1Y3RdeLXtENn7Nhrqgej8paDoX3np17JAZOyU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.27.2-k3s1 h1:DWULsFuyi/zP+nQA9pVBedXQ5SUy4eW01nLVnhCUsWs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.27.2-k3s1/go.mod h1:hyAEWqqvYYt7l3JT/F21wp4ziNW+hb1z+fEuUZnCm1A= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.27.2-k3s1 h1:7ah7xIrhxJx6OrAK2nixvWl69aA/0fzHJB4R4HC8fZ8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.27.2-k3s1/go.mod h1:M2kROdqx5g0WIu2Jx9CjNbWGFoPtoEYxJKqCPT9/784= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.27.2-k3s1 h1:KiBMpPztBUZ02IIZa5OwWXAVVHsgNwTnB2l2aijwiqw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.27.2-k3s1/go.mod h1:/TvCEFq8Hu960DruMf5qfYN4YJtbJL3pXGq/CIZ7Ilo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.27.2-k3s1 h1:xCA7dgT4lCoAVgXm2Yg6sSkln1rKCrIG1qnDUm8k84g= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.27.2-k3s1/go.mod h1:ZPAIqj7PFvKQQ+3PwB82p1ssc9ryMHc3N1UHFm3afJQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.27.2-k3s1 h1:4uYDZVE652d/dyj4Wu/P1qGJgKV+40vbHn8zvFtkAcI= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.27.2-k3s1/go.mod h1:WsvRzdiYtqnl7oxA/kSrtvk66nQSuHSALTvhYMPc714= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.27.2-k3s1 h1:dn0rlVE8YQhHbv9B/qQdM8ywB5ylvMqUpId+wBzVKpA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.27.2-k3s1/go.mod h1:NWuiMd69LXorPCzxKYhVjLJahLlbiC5c9mraIIXnnVw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.27.2-k3s1 h1:AZyp9WPveNyZPXQXkm1ep9NoclnMB53ehiToQC53Vus= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.27.2-k3s1/go.mod h1:InWdUp1J2Mrby+8Z3eW/WFrCqJzJMYryv8wowSuCZfA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.27.2-k3s1 h1:swEq2f4/SO/BBPgraaJyV1fLlptT9dch5dxbqDS6DSc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.27.2-k3s1/go.mod h1:+2PiYOYH7dkJbgE5wPq8Kw0GQxWYvtccHJ2L5fX0vsc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.27.2-k3s1 h1:337gA8Yjkdyidv/Z1IKXvnaIUyGqUSTJzCZeq3jdTxs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.27.2-k3s1/go.mod h1:mwIOl2Auu81bClSDUHsLATcGs0qyhaWWKqEGnqpfPdg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.27.2-k3s1 h1:vHfJswh254u2omwss1s+td3npdN8zcV0ygCGutnNZyY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.27.2-k3s1/go.mod h1:+soUGPSCPRv4nKEQeGq3Ky0JLCZMWJXWMYoClMcwh5o= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.27.2-k3s1 h1:Dm2R9jhkd+ID9OqZ2fQQjqi5oC6e+TehADbF0tN5n7c= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.27.2-k3s1/go.mod h1:vEIRbmVN0BaNdmQw/4ZJx+/j2+Y4Fq6eij7TYGKITOA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.27.2-k3s1 h1:224kK4qLH6aQivU0puHEwqTQj+Ukd4YOAwwvldXEt4I= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.27.2-k3s1/go.mod h1:zLV1t5ZWb7sFP6sJQAS3vPZ3lWY9ACXoDSL2y5BDR8g= +github.com/k3s-io/kubernetes v1.27.3-k3s1 h1:3Ff7GgPgmRKFAXRPJGvzZFVVCBSIFjF3tsLLDe/fDg4= +github.com/k3s-io/kubernetes v1.27.3-k3s1/go.mod h1:U8ZXeKBAPxeb4J4/HOaxjw1A9K6WfSH+fY2SS7CR6IM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.27.3-k3s1 h1:rUbaU3X3HQQLyEjnQmIQZXQYPaOllH4IxAcYuZHjpVU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.27.3-k3s1/go.mod h1:BkLIWuLYarkyXCgyBapJTaVKh6Y6dtizkSS6yaOw90A= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.27.3-k3s1 h1:z9xB+77porupE3Gj/gmVzHcBHPdO+zl5m6+i0YzBYys= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.27.3-k3s1/go.mod h1:zSDJGTKUDaXJ9QVqPPhOdv4Mc4o9sRF2kHG+8CariCg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.27.3-k3s1 h1:DBayNuD4C91wUI5cU7ziXHY3WyTatoU4uw6jRCMZfYM= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.27.3-k3s1/go.mod h1:Osfbq0FOlZe3tVCZPzx7nqzX6fBVrXwQbLq5+63kKzU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.27.3-k3s1 h1:Dd5FzgpftNrKwkmFdtfyuAMexf+MdZFYadREW2E5yTI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.27.3-k3s1/go.mod h1:F8MLr0HHTdIguLLfPPPfHjSHnFfxxT+g9VN+SXnAz30= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.27.3-k3s1 h1:4/g7Ayz3SvWPSKpGjeB0H7OXxYFy53vwkk/hijkon+c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.27.3-k3s1/go.mod h1:imCCbwtdkqQq1e48br+TMMKRQWA1b2dcnb3yuAZRQ0E= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.27.3-k3s1 h1:RBRQ7jUmPe+/kgFI5COOssM6ff10mBSVnkieoJDTQp8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.27.3-k3s1/go.mod h1:KDPXcl6hV3rFC8wffq2cNbO7epPc7usxhER/5g4Cc+w= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.27.3-k3s1 h1:AFWpIlXR/5WG7yXsGqmTmcqb+NF09BfC0CSoe38qA5I= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.27.3-k3s1/go.mod h1:IcPB/5jKQQI4ebDXsQigmOZIiAqlwgtQvIzmxHy3pGQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.27.3-k3s1/go.mod h1:0dF6zBk2bqVelXoKV8HzTSqggL8VwRWGT1IyJ2VmCbs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.27.3-k3s1 h1:oHRoyX3LJERBxADExEF9naNSmqxRJiKc7KnT+30PPCc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.27.3-k3s1/go.mod h1:J1XjMts5nmpmjnMkgWENknKJZz5XvN82A7S1AJ4qCZ0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.27.3-k3s1 h1:oqs2WMmCAV+8WbFijw4ucCzbN0dBfV4AcVS/QNpjlUw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.27.3-k3s1/go.mod h1:XH/mT02C+kohuNtjlyY/eSIUIKuaeiNC3wX9xkcRW+s= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.27.3-k3s1 h1:NATRPJ1ihcAgZmd0n1wz0GazMfCKgGtc3u2JGI1oOjc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.27.3-k3s1/go.mod h1:OhS2nNvxcwT4yrlk1UZL6pJsonPhxwlTLioArEyEDRQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.27.3-k3s1 h1:KWuPepU8rQxqV1MARXSDy7XDApRHT+JK7xkkFjYly1I= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.27.3-k3s1/go.mod h1:P3jQ0JFCbQmHTNdnpQ6+rgpBvHW5jRJdpY13LRFk9MY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.27.3-k3s1 h1:IduTUD8ewjhYlH0UhYYrz2Dyo3t/HEJ4AhgOKVZrdWo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.27.3-k3s1/go.mod h1:5/8Rts1Y3RdeLXtENn7Nhrqgej8paDoX3np17JAZOyU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.27.3-k3s1 h1:EmjVYz88iH6mwKJXMm8SGA3IxbPlICO+qD2mrSEyzQc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.27.3-k3s1/go.mod h1:hyAEWqqvYYt7l3JT/F21wp4ziNW+hb1z+fEuUZnCm1A= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.27.3-k3s1 h1:KiKhfPhxUHWVvdW2OZbwSWNQV2QMBw2pP0kaGHZrjpU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.27.3-k3s1/go.mod h1:M2kROdqx5g0WIu2Jx9CjNbWGFoPtoEYxJKqCPT9/784= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.27.3-k3s1 h1:EMDGc+uYJJ9ZmY6uY6a5/OzYUvPv1rbl/C8d0O66BUY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.27.3-k3s1/go.mod h1:/TvCEFq8Hu960DruMf5qfYN4YJtbJL3pXGq/CIZ7Ilo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.27.3-k3s1 h1:KS2FmFdQGkGNVZGxjSa5aIURh6Y+JJGtWn8dDmje2/I= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.27.3-k3s1/go.mod h1:ZPAIqj7PFvKQQ+3PwB82p1ssc9ryMHc3N1UHFm3afJQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.27.3-k3s1 h1:kBiRdU7kATcycY15PUqpmwdRdHHKrqR4YReTMDZCgBE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.27.3-k3s1/go.mod h1:WsvRzdiYtqnl7oxA/kSrtvk66nQSuHSALTvhYMPc714= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.27.3-k3s1 h1:/CCdTxWa+xPU/zlKzU7wBXxVJ2y616GXCGtrZvtfJjw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.27.3-k3s1/go.mod h1:NWuiMd69LXorPCzxKYhVjLJahLlbiC5c9mraIIXnnVw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.27.3-k3s1 h1:Qny1YmuCovHAtyQO9bhEjkByCF31o4FkA3hqGw/IU88= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.27.3-k3s1/go.mod h1:InWdUp1J2Mrby+8Z3eW/WFrCqJzJMYryv8wowSuCZfA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.27.3-k3s1 h1:sFOlOoNrvkYxp1lZ8X/6X7l5SgKJm3Bqcebwl6aX3V8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.27.3-k3s1/go.mod h1:+2PiYOYH7dkJbgE5wPq8Kw0GQxWYvtccHJ2L5fX0vsc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.27.3-k3s1 h1:sX5cvoJmxXZW7yGVIp++0KrjPVavy0yTem+XZtT2PhA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.27.3-k3s1/go.mod h1:mwIOl2Auu81bClSDUHsLATcGs0qyhaWWKqEGnqpfPdg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.27.3-k3s1 h1:DiOMhdklTctyePaM5qPCrgXZhveDGp4MQct3bBclMVk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.27.3-k3s1/go.mod h1:+soUGPSCPRv4nKEQeGq3Ky0JLCZMWJXWMYoClMcwh5o= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.27.3-k3s1 h1:BHpMwKt80JEnKvmiXcJj7Sit+1iwpNwBzOvj3OsdiuU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.27.3-k3s1/go.mod h1:vEIRbmVN0BaNdmQw/4ZJx+/j2+Y4Fq6eij7TYGKITOA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.27.3-k3s1 h1:A6aumz1+lMkGDlGNeyECSz0eQUYNuivM+ynKJpIKImA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.27.3-k3s1/go.mod h1:zLV1t5ZWb7sFP6sJQAS3vPZ3lWY9ACXoDSL2y5BDR8g= github.com/k3s-io/stargz-snapshotter v0.13.0-k3s1 h1:Kxs7Y1kayAX3hr3X+rkSBCaDwaWR/OfbWy+oESiBnN0= github.com/k3s-io/stargz-snapshotter v0.13.0-k3s1/go.mod h1:k+OjA93AK1owz6DgNIpxuiepp/SGrSZ0HX6lWjA3CVI= github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.27.3+rke2r1/pkg/cli/cmds/cert.go new/rke2-1.27.4+rke2r1/pkg/cli/cmds/cert.go --- old/rke2-1.27.3+rke2r1/pkg/cli/cmds/cert.go 2023-06-21 01:39:04.000000000 +0200 +++ new/rke2-1.27.4+rke2r1/pkg/cli/cmds/cert.go 2023-07-20 00:38:47.000000000 +0200 @@ -48,6 +48,10 @@ "server": copyFlag, "path": copyFlag, "force": copyFlag, + "data-dir": { + Usage: "(data) Folder to hold state", + Default: rke2Path, + }, }, } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.27.3+rke2r1/pkg/cli/cmds/server.go new/rke2-1.27.4+rke2r1/pkg/cli/cmds/server.go --- old/rke2-1.27.3+rke2r1/pkg/cli/cmds/server.go 2023-06-21 01:39:04.000000000 +0200 +++ new/rke2-1.27.4+rke2r1/pkg/cli/cmds/server.go 2023-07-20 00:38:47.000000000 +0200 @@ -141,6 +141,7 @@ "etcd-s3-insecure": copyFlag, "etcd-s3-timeout": copyFlag, "disable-helm-controller": dropFlag, + "helm-job-image": copyFlag, "enable-pprof": copyFlag, "servicelb-namespace": copyFlag, }) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.27.3+rke2r1/pkg/pebinaryexecutor/pebinary.go new/rke2-1.27.4+rke2r1/pkg/pebinaryexecutor/pebinary.go --- old/rke2-1.27.3+rke2r1/pkg/pebinaryexecutor/pebinary.go 2023-06-21 01:39:04.000000000 +0200 +++ new/rke2-1.27.4+rke2r1/pkg/pebinaryexecutor/pebinary.go 2023-07-20 00:38:47.000000000 +0200 @@ -16,6 +16,7 @@ "github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim/hcn" + "github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io" "github.com/k3s-io/k3s/pkg/cli/cmds" daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/executor" @@ -24,7 +25,9 @@ "github.com/rancher/rke2/pkg/logging" win "github.com/rancher/rke2/pkg/windows" "github.com/sirupsen/logrus" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/authentication/authenticator" + "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" ) @@ -50,7 +53,8 @@ KubeConfigKubeProxy string DisableETCD bool IsServer bool - cni win.Calico + CNI string + CNIConfig win.Calico } type CloudProviderConfig struct { @@ -58,6 +62,13 @@ Path string } +const ( + CNINone = "none" + CNICalico = "calico" + CNICilium = "cilium" + CNICanal = "canal" +) + // Bootstrap prepares the binary executor to run components by setting the system default registry // and staging the kubelet and containerd binaries. On servers, it also ensures that manifests are // copied in to place and in sync with the system configuration. @@ -94,10 +105,22 @@ restConfig, err := clientcmd.BuildConfigFromFlags("", nodeConfig.AgentConfig.KubeConfigK3sController) - if err := p.cni.Setup(ctx, nodeConfig, restConfig, p.DataDir); err != nil { + p.CNI, err = getCniType(restConfig) + if err != nil { return err } + switch p.CNI { + case "", CNICalico: + if err := p.CNIConfig.Setup(ctx, nodeConfig, restConfig, p.DataDir); err != nil { + return err + } + case CNINone: + logrus.Info("Skipping CNI setup") + default: + logrus.Fatal("Unsupported CNI: ", p.CNI) + } + // required to initialize KubeProxy p.KubeConfigKubeProxy = nodeConfig.AgentConfig.KubeConfigKubeProxy @@ -135,11 +158,13 @@ go func() { for { cniCtx, cancel := context.WithCancel(ctx) - go func() { - if err := p.cni.Start(cniCtx); err != nil { - logrus.Errorf("error in cni start: %s", err) - } - }() + if p.CNI != CNINone { + go func() { + if err := p.CNIConfig.Start(cniCtx); err != nil { + logrus.Errorf("error in cni start: %s", err) + } + }() + } cmd := exec.CommandContext(ctx, p.KubeletPath, cleanArgs...) cmd.Stdout = logOut @@ -156,9 +181,13 @@ // KubeProxy starts the kubeproxy in a subprocess with watching goroutine. func (p *PEBinaryConfig) KubeProxy(ctx context.Context, args []string) error { + if p.CNI == CNINone { + return nil + } + extraArgs := map[string]string{ - "network-name": p.cni.CNICfg.OverlayNetName, - "bind-address": p.cni.CNICfg.IP, + "network-name": p.CNIConfig.CNICfg.OverlayNetName, + "bind-address": p.CNIConfig.CNICfg.IP, } if err := hcn.DSRSupported(); err == nil { @@ -167,7 +196,7 @@ extraArgs["enable-dsr"] = "true" } - if p.cni.CNICfg.Name == "Calico" { + if p.CNIConfig.CNICfg.Name == "Calico" { var vip string for range time.Tick(time.Second * 5) { endpoint, err := hcsshim.GetHNSEndpointByName("Calico_ep") @@ -258,6 +287,28 @@ return args } +func getCniType(restConfig *rest.Config) (string, error) { + hc, err := helm.NewFactoryFromConfig(restConfig) + if err != nil { + return "", err + } + hl, err := hc.Helm().V1().HelmChart().List(metav1.NamespaceSystem, metav1.ListOptions{}) + if err != nil { + return "", err + } + for _, h := range hl.Items { + switch h.Name { + case win.CalicoChart: + return CNICalico, nil + case "rke2-cilium": + return CNICilium, nil + case "rke2-canal": + return CNICanal, nil + } + } + return CNINone, nil +} + // setWindowsAgentSpecificSettings configures the correct paths needed for Windows func setWindowsAgentSpecificSettings(dataDir string, nodeConfig *daemonconfig.Node) { nodeConfig.AgentConfig.CNIBinDir = filepath.Join("c:\\", dataDir, "bin") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.27.3+rke2r1/pkg/podexecutor/staticpod.go new/rke2-1.27.4+rke2r1/pkg/podexecutor/staticpod.go --- old/rke2-1.27.3+rke2r1/pkg/podexecutor/staticpod.go 2023-06-21 01:39:04.000000000 +0200 +++ new/rke2-1.27.4+rke2r1/pkg/podexecutor/staticpod.go 2023-07-20 00:38:47.000000000 +0200 @@ -280,10 +280,11 @@ "--audit-log-maxbackup=10", "--audit-log-maxsize=100", } - args = append(extraArgs, args...) if auditLogFile == "" { auditLogFile = filepath.Join(s.DataDir, "server/logs/audit.log") + extraArgs = append(extraArgs, "--audit-log-path="+auditLogFile) } + args = append(extraArgs, args...) } args = append([]string{"--admission-control-config-file=" + s.PSAConfigFile}, args...) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.27.3+rke2r1/pkg/rke2/rke2_windows.go new/rke2-1.27.4+rke2r1/pkg/rke2/rke2_windows.go --- old/rke2-1.27.3+rke2r1/pkg/rke2/rke2_windows.go 2023-06-21 01:39:04.000000000 +0200 +++ new/rke2-1.27.4+rke2r1/pkg/rke2/rke2_windows.go 2023-07-20 00:38:47.000000000 +0200 @@ -69,5 +69,6 @@ KubeletPath: cfg.KubeletPath, DisableETCD: clx.Bool("disable-etcd"), IsServer: isServer, + CNI: "", }, nil } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.27.3+rke2r1/pkg/windows/calico.go new/rke2-1.27.4+rke2r1/pkg/windows/calico.go --- old/rke2-1.27.3+rke2r1/pkg/windows/calico.go 2023-06-21 01:39:04.000000000 +0200 +++ new/rke2-1.27.4+rke2r1/pkg/windows/calico.go 2023-07-20 00:38:47.000000000 +0200 @@ -17,6 +17,7 @@ "github.com/k3s-io/k3s/pkg/version" "github.com/pkg/errors" "github.com/sirupsen/logrus" + opv1 "github.com/tigera/operator/api/v1" authv1 "k8s.io/api/authentication/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -104,7 +105,11 @@ "Value": { "Type": "SDNROUTE", "DestinationPrefix": "{{ .ServiceCIDR }}", - "NeedEncap": true + {{- if eq .Mode "vxlan" }} + "NeedEncap": true + {{- else }} + "NeedEncap": false + {{- end }} } } ] @@ -125,6 +130,7 @@ CalicoSystemNamespace = "calico-system" CalicoChart = "rke2-calico" calicoNode = "calico-node" + calicoLogPath = "C:\\var\\log\\" ) // Setup creates the basic configuration required by the CNI. @@ -264,6 +270,9 @@ break } go startFelix(ctx, c.CNICfg) + if c.CNICfg.Mode == "windows-bgp" { + go startConfd(ctx, c.CNICfg) + } return nil } @@ -279,10 +288,10 @@ // 2 - c.CNICfg.Interface which set if NodeAddressAutodetection is set (Calico HelmChart) // 3 - nodeIP if defined // 4 - None of the above. In that case, by default the interface with the default route is picked - vxlanAdapter := os.Getenv("VXLAN_ADAPTER") - if vxlanAdapter == "" { + networkAdapter := os.Getenv("VXLAN_ADAPTER") + if networkAdapter == "" { if c.CNICfg.Interface != "" { - vxlanAdapter = c.CNICfg.Interface + networkAdapter = c.CNICfg.Interface } if c.CNICfg.Interface == "" && c.CNICfg.IP != "" { @@ -290,11 +299,11 @@ if err != nil { return err } - vxlanAdapter = iFace + networkAdapter = iFace } } - mgmt, err := createHnsNetwork(c.CNICfg.Mode, vxlanAdapter) + mgmt, err := createHnsNetwork(c.CNICfg.Mode, networkAdapter) if err != nil { return err } @@ -337,42 +346,81 @@ } logrus.Debugf("calico override found: %s\n", string(b)) if nodeV4 := overrides.Installation.CalicoNetwork.NodeAddressAutodetectionV4; nodeV4 != nil { - IPAutoDetectionMethod, err := nodeAddressAutodetection(*nodeV4) + c.CNICfg.IPAutoDetectionMethod, c.CNICfg.Interface, err = findCalicoInterface(nodeV4) if err != nil { return err } - logrus.Debugf("this is IPAutoDetectionMethod: %s", IPAutoDetectionMethod) - c.CNICfg.IPAutoDetectionMethod = IPAutoDetectionMethod - - var calicoInterface string - if strings.Contains(IPAutoDetectionMethod, "cidrs") { - calicoInterface, err = findInterfaceCIDR(nodeV4.CIDRS) - if err != nil { - return err - } + } + if bgpEnabled := overrides.Installation.CalicoNetwork.BGP; bgpEnabled != nil { + if *bgpEnabled == opv1.BGPEnabled { + c.CNICfg.Mode = "windows-bgp" } + } + return nil +} - if strings.Contains(IPAutoDetectionMethod, "interface") { - calicoInterface, err = findInterfaceRegEx(nodeV4.Interface) - if err != nil { - return err - } +func findCalicoInterface(nodeV4 *opv1.NodeAddressAutodetection) (IPAutoDetectionMethod, calicoInterface string, err error) { + IPAutoDetectionMethod, err = nodeAddressAutodetection(*nodeV4) + if err != nil { + return "", "", err + } + + if strings.Contains(IPAutoDetectionMethod, "cidrs") { + calicoInterface, err = findInterfaceCIDR(nodeV4.CIDRS) + if err != nil { + return "", "", err } + } - if strings.Contains(IPAutoDetectionMethod, "can-reach") { - calicoInterface, err = findInterfaceReach(nodeV4.CanReach) - if err != nil { - return err - } + if strings.Contains(IPAutoDetectionMethod, "interface") { + calicoInterface, err = findInterfaceRegEx(nodeV4.Interface) + if err != nil { + return "", "", err } + } + if strings.Contains(IPAutoDetectionMethod, "can-reach") { + calicoInterface, err = findInterfaceReach(nodeV4.CanReach) + if err != nil { + return "", "", err + } + } + return +} - c.CNICfg.Interface = calicoInterface +func startConfd(ctx context.Context, config *CalicoConfig) { + outputFile, err := os.Create(calicoLogPath + "confd.log") + if err != nil { + logrus.Fatalf("error creating confd.log: %v", err) + return } + defer outputFile.Close() - return nil + specificEnvs := []string{ + fmt.Sprintf("PATH=%s", os.Getenv("PATH")), + } + + args := []string{ + "-confd", + fmt.Sprintf( "-confd-confdir=%s", filepath.Join(config.CNI.BinDir, "confd")), + } + + logrus.Infof("Confd Envs: %s", append(generateGeneralCalicoEnvs(config), specificEnvs...)) + cmd := exec.CommandContext(ctx, "calico-node.exe", args...) + cmd.Env = append(generateGeneralCalicoEnvs(config), specificEnvs...) + cmd.Stdout = outputFile + cmd.Stderr = outputFile + _ = os.Chdir(filepath.Join(config.CNI.BinDir, "confd")) + _ = cmd.Run() + logrus.Error("Confd exited") } 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 +434,19 @@ 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 +457,8 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.27.3+rke2r1/pkg/windows/utils.go new/rke2-1.27.4+rke2r1/pkg/windows/utils.go --- old/rke2-1.27.3+rke2r1/pkg/windows/utils.go 2023-06-21 01:39:04.000000000 +0200 +++ new/rke2-1.27.4+rke2r1/pkg/windows/utils.go 2023-07-20 00:38:47.000000000 +0200 @@ -22,18 +22,18 @@ ) // createHnsNetwork creates the network that will connect nodes and returns its managementIP -func createHnsNetwork(backend string, vxlanAdapter string) (string, error) { +func createHnsNetwork(backend string, networkAdapter string) (string, error) { var network hcsshim.HNSNetwork if backend == "vxlan" { // Ignoring the return because both true and false without an error represent that the firewall rule was created or already exists if _, err := wapi.FirewallRuleAdd("OverlayTraffic4789UDP", "Overlay network traffic UDP", "", "4789", wapi.NET_FW_IP_PROTOCOL_UDP, wapi.NET_FW_PROFILE2_ALL); err != nil { return "", fmt.Errorf("error creating firewall rules: %v", err) } - logrus.Infof("Creating VXLAN network using the vxlanAdapter: %s", vxlanAdapter) + logrus.Infof("Creating VXLAN network using the vxlanAdapter: %s", networkAdapter) network = hcsshim.HNSNetwork{ Type: "Overlay", Name: CalicoHnsNetworkName, - NetworkAdapterName: vxlanAdapter, + NetworkAdapterName: networkAdapter, Subnets: []hcsshim.Subnet{ { AddressPrefix: "192.168.255.0/30", @@ -45,21 +45,18 @@ }, } } else { - return "", fmt.Errorf("The Calico backend %s is not supported. Only vxlan backend is supported", backend) + network = hcsshim.HNSNetwork{ + Type: "L2Bridge", + Name: CalicoHnsNetworkName, + NetworkAdapterName: networkAdapter, + Subnets: []hcsshim.Subnet{ + { + AddressPrefix: "192.168.255.0/30", + GatewayAddress: "192.168.255.1", + }, + }, + } } - // Currently, only vxlan is supported. Leaving the code for future - //} else { - // network = hcsshim.HNSNetwork{ - // Type: "L2Bridge", - // Name: CalicoHnsNetworkName, - // Subnets: []hcsshim.Subnet{ - // { - // AddressPrefix: "192.168.255.0/30", - // GatewayAddress: "192.168.255.1", - // }, - // }, - // } - //} if _, err := network.Create(); err != nil { return "", fmt.Errorf("error creating the %s network: %v", CalicoHnsNetworkName, err) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.27.3+rke2r1/scripts/build-images new/rke2-1.27.4+rke2r1/scripts/build-images --- old/rke2-1.27.3+rke2r1/scripts/build-images 2023-06-21 01:39:04.000000000 +0200 +++ new/rke2-1.27.4+rke2r1/scripts/build-images 2023-07-20 00:38:47.000000000 +0200 @@ -22,7 +22,7 @@ ${REGISTRY}/rancher/klipper-lb:v0.4.4 ${REGISTRY}/rancher/mirrored-pause:${PAUSE_VERSION} ${REGISTRY}/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20230312-helm-chart-4.5.2-28-g66a760794 - ${REGISTRY}/rancher/nginx-ingress-controller:nginx-1.6.4-hardened5 + ${REGISTRY}/rancher/nginx-ingress-controller:nginx-1.7.1-hardened1 ${REGISTRY}/rancher/rke2-cloud-provider:${CCM_VERSION} ${REGISTRY}/rancher/mirrored-sig-storage-snapshot-controller:v6.2.1 ${REGISTRY}/rancher/mirrored-sig-storage-snapshot-validation-webhook:v6.2.1 @@ -49,14 +49,14 @@ 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 @@ -71,7 +71,7 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.27.3+rke2r1/scripts/version.sh new/rke2-1.27.4+rke2r1/scripts/version.sh --- old/rke2-1.27.3+rke2r1/scripts/version.sh 2023-06-21 01:39:04.000000000 +0200 +++ new/rke2-1.27.4+rke2r1/scripts/version.sh 2023-07-20 00:38:47.000000000 +0200 @@ -31,8 +31,8 @@ PLATFORM=${GOOS}-${GOARCH} RELEASE=${PROG}.${PLATFORM} # hardcode versions unless set specifically -KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.27.3} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.27.3-rke2r1-build20230614} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.27.4} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.27.4-rke2r1-build20230719} ETCD_VERSION=${ETCD_VERSION:-v3.5.7-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230608} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.27.3+rke2r1/tests/install/opensuse-leap/Vagrantfile new/rke2-1.27.4+rke2r1/tests/install/opensuse-leap/Vagrantfile --- old/rke2-1.27.3+rke2r1/tests/install/opensuse-leap/Vagrantfile 1970-01-01 01:00:00.000000000 +0100 +++ new/rke2-1.27.4+rke2r1/tests/install/opensuse-leap/Vagrantfile 2023-07-20 00:38:47.000000000 +0200 @@ -0,0 +1,131 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +ENV['TEST_INSTALL_SH'] ||= '../../../install.sh' + +Vagrant.configure("2") do |config| + config.vm.box = 'opensuse/Leap-15.4.x86_64' + config.vm.boot_timeout = ENV['TEST_VM_BOOT_TIMEOUT'] || 600 # seconds + config.vm.synced_folder '.', '/vagrant', type: 'rsync', disabled: false + %w[libvirt virtualbox vmware_desktop].each do |p| + config.vm.provider p do |v, o| + v.cpus = ENV['TEST_VM_CPUS'] || 2 + v.memory = ENV['TEST_VM_MEMORY'] || 3072 + end + end + + external_env = "" + ENV.select{|k,v| k.start_with?('RKE2_') || k.start_with?('INSTALL_RKE2_')}.each {|key,value| external_env << "#{key.to_s}=#{value.to_s}"} + + config.vm.define "install-leap-15.4", primary: true do |test| + test.vm.hostname = 'smoke' + test.vm.provision 'rke2-upload-installer', type: 'file', run: 'always', source: ENV['TEST_INSTALL_SH'], destination: 'install.sh' + test.vm.provision"rke2-install", type: 'rke2', run: "once" do |rke2| + rke2.installer_url = 'file:///home/vagrant/install.sh' + rke2.env = %W[ #{external_env} INSTALL_RKE2_TYPE=server] + rke2.config = <<~YAML + token: 'vagrant' + YAML + rke2.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321 + end + test.vm.provision "rke2-wait-for-node", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh| + sh.inline = <<~SHELL + #!/usr/bin/env bash + set -eu -o pipefail + echo 'Waiting for node (and static pods) to be ready ...' + time { + timeout 240 bash -c 'while ! (kubectl wait --for condition=ready node/$(hostnamectl --static) 2>/dev/null); do sleep 5; done' + timeout 240 bash -c 'while ! (kubectl wait --for condition=ready -n kube-system pod/etcd-$(hostnamectl --static) 2>/dev/null); do sleep 5; done' + timeout 240 bash -c 'while ! (kubectl wait --for condition=ready -n kube-system pod/kube-apiserver-$(hostnamectl --static) 2>/dev/null); do sleep 5; done' + timeout 240 bash -c 'while ! (kubectl wait --for condition=ready -n kube-system pod/kube-scheduler-$(hostnamectl --static) 2>/dev/null); do sleep 5; done' + timeout 240 bash -c 'while ! (kubectl wait --for condition=ready -n kube-system pod/kube-proxy-$(hostnamectl --static) 2>/dev/null); do sleep 5; done' + timeout 240 bash -c 'while ! (kubectl wait --for condition=ready -n kube-system pod/kube-controller-manager-$(hostnamectl --static) 2>/dev/null); do sleep 5; done' + timeout 240 bash -c 'while ! (kubectl wait --for condition=ready -n kube-system pod/cloud-controller-manager-$(hostnamectl --static) 2>/dev/null); do sleep 5; done' + } + kubectl get node,all -A -o wide + SHELL + end + test.vm.provision "rke2-wait-for-canal", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh| + sh.inline = <<~SHELL + #!/usr/bin/env bash + set -eu -o pipefail + time { + timeout 240 bash -c 'while ! (kubectl --namespace kube-system rollout status --timeout 10s daemonset/rke2-canal 2>/dev/null); do sleep 5; done' + } + SHELL + end + test.vm.provision "rke2-wait-for-coredns", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh| + sh.inline = <<~SHELL + #!/usr/bin/env bash + set -eu -o pipefail + time { + timeout 240 bash -c 'while ! (kubectl --namespace kube-system rollout status --timeout 10s deploy/rke2-coredns-rke2-coredns 2>/dev/null); do sleep 5; done' + timeout 240 bash -c 'while ! (kubectl --namespace kube-system rollout status --timeout 10s deploy/rke2-coredns-rke2-coredns-autoscaler 2>/dev/null); do sleep 5; done' + } + SHELL + end + test.vm.provision "rke2-wait-for-ingress-nginx", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh| + sh.inline = <<~SHELL + #!/usr/bin/env bash + set -eu -o pipefail + time { + timeout 240 bash -c 'while ! (kubectl --namespace kube-system rollout status --timeout 10s daemonset/rke2-ingress-nginx-controller 2>/dev/null); do sleep 5; done' + } + SHELL + end + test.vm.provision "rke2-wait-for-metrics-server", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh| + sh.inline = <<~SHELL + #!/usr/bin/env bash + set -eu -o pipefail + time { + timeout 240 bash -c 'while ! (kubectl --namespace kube-system rollout status --timeout 10s deploy/rke2-metrics-server 2>/dev/null); do sleep 5; done' + } + SHELL + end + test.vm.provision "rke2-status", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh| + sh.inline = <<~SHELL + #!/usr/bin/env bash + set -eux -o pipefail + kubectl get node,all -A -o wide + SHELL + end + test.vm.provision "rke2-procps", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh| + sh.inline = <<~SHELL + #!/usr/bin/env bash + set -eux -o pipefail + ps auxZ | grep -E 'etcd|kube|rke2|container|spc_t|unconfined_t' | grep -v grep + SHELL + end + end + + config.vm.provision "install-packages", type: "shell", run: "once" do |sh| + sh.upload_path = "/tmp/vagrant-install-packages" + sh.env = { + 'INSTALL_PACKAGES': ENV['INSTALL_PACKAGES'], + } + sh.inline = <<~SHELL + #!/usr/bin/env bash + set -eux -o pipefail + zypper install -y \ + curl \ + iptables \ + less \ + lsof \ + socat \ + restorecond \ + policycoreutils + ${INSTALL_PACKAGES} + SHELL + end + + config.vm.provision "selinux-status", type: "shell", run: "once", inline: "sestatus -v" + config.vm.provision "rke2-profile-env", type: "shell", run: "once" do |sh| + sh.inline = <<~SHELL + #!/usr/bin/env bash + cat <<-EOF > /etc/profile.d/rke2.sh +export KUBECONFIG=/etc/rancher/rke2/rke2.yaml PATH=/usr/local/bin:$PATH:/var/lib/rancher/rke2/bin +EOF + SHELL + end + +end ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/rke2/vendor.tar.gz /work/SRC/openSUSE:Factory/.rke2.new.22712/vendor.tar.gz differ: char 5, line 1
