diff --git a/Dockerfile b/Dockerfile index dc72732051..802b0ae232 100644 --- a/Dockerfile +++ b/Dockerfile @@ -105,7 +105,7 @@ ARG KUBERNETES_VERSION="" ARG CACHEBUST="cachebust" COPY charts/ /charts/ RUN echo ${CACHEBUST}>/dev/null -RUN CHART_VERSION="1.14.100" CHART_FILE=/charts/rke2-cilium.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh +RUN CHART_VERSION="1.14.200" CHART_FILE=/charts/rke2-cilium.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="v3.26.1-build2023080200" CHART_FILE=/charts/rke2-canal.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="v3.26.101" CHART_FILE=/charts/rke2-calico.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="v3.26.101" CHART_FILE=/charts/rke2-calico-crd.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh diff --git a/Vagrantfile b/Vagrantfile index e1b9febb2f..6002a9f0d8 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -108,7 +108,7 @@ EOF # SELinux is Enforcing by default. # To set SELinux as Disabled on a VM that has already been provisioned: # SELINUX=Disabled vagrant up --provision-with=selinux - # To set SELinux as Permissive on a VM that has already been provsioned + # To set SELinux as Permissive on a VM that has already been provisioned # SELINUX=Permissive vagrant up --provision-with=selinux config.vm.provision "selinux", type: "shell", run: "once" do |sh| sh.upload_path = "/tmp/vagrant-selinux" diff --git a/go.mod b/go.mod index 4457135f29..f2f509fafc 100644 --- a/go.mod +++ b/go.mod @@ -49,41 +49,42 @@ replace ( 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.5-k3s1 - k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.27.5-k3s1 - k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.27.5-k3s1 - k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.27.5-k3s1 - k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.27.5-k3s1 - k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.27.5-k3s1 - k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.27.5-k3s1 - k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.27.5-k3s1 - k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.27.5-k3s1 - k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.27.5-k3s1 - k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.27.5-k3s1 - k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.27.5-k3s1 - k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.27.5-k3s1 - k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.27.5-k3s1 - k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.27.5-k3s1 + k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.27.6-k3s1 + k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.27.6-k3s1 + k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.27.6-k3s1 + k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.27.6-k3s1 + k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.27.6-k3s1 + k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.27.6-k3s1 + k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.27.6-k3s1 + k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.27.6-k3s1 + k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.27.6-k3s1 + k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.27.6-k3s1 + k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.27.6-k3s1 + k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.27.6-k3s1 + k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.27.6-k3s1 + k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.27.6-k3s1 + k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.27.6-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.5-k3s1 - k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.27.5-k3s1 - k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.27.5-k3s1 + k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.27.6-k3s1 + k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.27.6-k3s1 + k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.27.6-k3s1 k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f - k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.27.5-k3s1 - k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.27.5-k3s1 - k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.27.5-k3s1 - k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.27.5-k3s1 - k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.27.5-k3s1 - k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.27.5-k3s1 - k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.27.5-k3s1 - k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.27.5-k3s1 - k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.27.5-k3s1 - k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.27.5-k3s1 - k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.27.5-k3s1 - k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.27.5-k3s1 - k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.27.5-k3s1 + k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.27.6-k3s1 + k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.27.6-k3s1 + k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.27.6-k3s1 + k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.27.6-k3s1 + k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.27.6-k3s1 + k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.27.6-k3s1 + k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.27.6-k3s1 + k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.27.6-k3s1 + k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.27.6-k3s1 + k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.27.6-k3s1 + k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.27.6-k3s1 + k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.27.6-k3s1 + k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.27.6-k3s1 mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 + vbom.ml/util => github.com/fvbommel/util v0.0.3 // github.com/tigera/operator using old repo ) require ( @@ -93,7 +94,7 @@ require ( github.com/google/go-containerregistry v0.14.0 github.com/iamacarpet/go-win64api v0.0.0-20210311141720-fe38760bed28 github.com/k3s-io/helm-controller v0.15.4 - github.com/k3s-io/k3s v1.27.7-0.20231006204022-6c2a7cb3163c + github.com/k3s-io/k3s v1.27.7-0.20231011231750-f294e2b22ec1 //release-1.27 github.com/libp2p/go-netroute v0.2.0 github.com/natefinch/lumberjack v2.0.0+incompatible github.com/onsi/ginkgo/v2 v2.11.0 diff --git a/go.sum b/go.sum index 567be4fbce..23dd71e591 100644 --- a/go.sum +++ b/go.sum @@ -202,6 +202,7 @@ github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2y github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D1fsDb3EJvhqgXRbFx7bs2wqZ10HQPeU8U/Q= github.com/bronze1man/goStrongswanVici v0.0.0-20201105010758-936f38b697fd h1:qn6a8rGrW+7p4ghypmYHZUKewXURuUDYxKqZxEoFjPc= github.com/bronze1man/goStrongswanVici v0.0.0-20201105010758-936f38b697fd/go.mod h1:fWUtBEPt2yjrr3WFhOqvajM8JSEU8bEeBcoeSCsKRpc= +github.com/bruth/assert v0.0.0-20130823105606-de420fa3b72e/go.mod h1:MT8TZkfLPRir91B19sXF7pmKBma+n6ecyjbqgXabchs= github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/caarlos0/ctrlc v1.0.0/go.mod h1:CdXpj4rmq0q/1Eb44M9zi2nKB0QraNKuRGYGrrHhcQw= @@ -443,6 +444,7 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS github.com/fsouza/go-dockerclient v0.0.0-20171004212419-da3951ba2e9e/go.mod h1:KpcjM623fQYE9MZiTGzKhjfxXAV9wbyX2C1cyRHfhl0= github.com/fullstorydev/grpcurl v1.8.0/go.mod h1:Mn2jWbdMrQGJQ8UD62uNyMumT2acsZUCkZIqFxsQf1o= github.com/fullstorydev/grpcurl v1.8.1/go.mod h1:3BWhvHZwNO7iLXaQlojdg5NA6SxUDePli4ecpK1N7gw= +github.com/fvbommel/util v0.0.3/go.mod h1:izA2AZeYyvrB6Qo1T9wenVzrx1Clqo3ReUreqM8o5t8= github.com/getsentry/raven-go v0.0.0-20190513200303-c977f96e1095/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew= @@ -569,7 +571,6 @@ github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= github.com/google/cadvisor v0.47.2 h1:lOS3Yprk88AIUi260eKYmTC4pKWAFkXV6Xev5jfCIP8= github.com/google/cadvisor v0.47.2/go.mod h1:iJdTjcjyKHjLCf7OSTzwP5GxdfrkPusw2x5bwGvuLUw= -github.com/google/cel-go v0.12.6/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw= github.com/google/cel-go v0.12.7 h1:jM6p55R0MKBg79hZjn1zs2OlrywZ1Vk00rxVvad1/O0= github.com/google/cel-go v0.12.7/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw= github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= @@ -827,8 +828,8 @@ github.com/k3s-io/etcd/server/v3 v3.5.9-k3s1 h1:B3039IkTPnwQEt4tIMjC6yd6b1Q3Z9ZZ github.com/k3s-io/etcd/server/v3 v3.5.9-k3s1/go.mod h1:GgI1fQClQCFIzuVjlvdbMxNbnISt90gdfYyqiAIt65g= github.com/k3s-io/helm-controller v0.15.4 h1:l4DWmUWpphbtwmuXGtpr5Rql/2NaCLSv4ZD8HlND9uY= github.com/k3s-io/helm-controller v0.15.4/go.mod h1:BgCPBQblj/Ect4Q7/Umf86WvyDjdG/34D+n8wfXtoeM= -github.com/k3s-io/k3s v1.27.7-0.20231006204022-6c2a7cb3163c h1:3qlbyFLw8IQnZHI+j/UkD6mZSaszOW3k6m8LQHAlEuo= -github.com/k3s-io/k3s v1.27.7-0.20231006204022-6c2a7cb3163c/go.mod h1:CrkFg3ts0r6c6Pz/fjRZmz9f+AKSR6YJbfW1+Ypx+Wg= +github.com/k3s-io/k3s v1.27.7-0.20231011231750-f294e2b22ec1 h1:CLwv6MuqrAwjc8cwQwJnkDck8AjbsxhkjvsWUCHrjuM= +github.com/k3s-io/k3s v1.27.7-0.20231011231750-f294e2b22ec1/go.mod h1:CrkFg3ts0r6c6Pz/fjRZmz9f+AKSR6YJbfW1+Ypx+Wg= github.com/k3s-io/kine v0.10.3 h1:OamjhtcQnK7zpzbiUDvXXKaAwdkXIuzr+nuyFWSC1ZA= github.com/k3s-io/kine v0.10.3/go.mod h1:hiOK3Gj89Py+AB11YK0fxEwkdWxBvNfaMt8PRWXqh6M= github.com/k3s-io/klog v1.0.0-k3s2/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= @@ -836,57 +837,57 @@ github.com/k3s-io/klog/v2 v2.90.1-k3s1 h1:QOJ/1xi4ERgpPGmSI3n1f989XjII+OvPdgdiMO 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.5-k3s1 h1:zK2F5uFY+yHb78qaX+4aeDsBfqOhBZP2B1SDiamhwzk= -github.com/k3s-io/kubernetes v1.27.5-k3s1/go.mod h1:MbYZxAacYS6HjZ6VJuvKaKTilbzp0B0atzW3J8TFBEo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.27.5-k3s1 h1:BMWZUVZdkZgagDhXW4r+traFzXGbtS31geFrtmCn+4s= -github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.27.5-k3s1/go.mod h1:KwsY6iImdPT12Sn8tPPvvTKtNaynXDjWEhaN+snOcuE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.27.5-k3s1 h1:ggI6Zka+G+CZOrzEF9t7Fztkw7egzXmkbmQkIRdfB/g= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.27.5-k3s1/go.mod h1:zSDJGTKUDaXJ9QVqPPhOdv4Mc4o9sRF2kHG+8CariCg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.27.5-k3s1 h1:O2jz0la46oL0qYtFa55XX6P4m+4dbe5s6b9VK1iFnpE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.27.5-k3s1/go.mod h1:Osfbq0FOlZe3tVCZPzx7nqzX6fBVrXwQbLq5+63kKzU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.27.5-k3s1 h1:WsgbzEiiwIIUBxIvXfLux5O1TT4Z87ANXWVGQQyHaWQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.27.5-k3s1/go.mod h1:F8MLr0HHTdIguLLfPPPfHjSHnFfxxT+g9VN+SXnAz30= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.27.5-k3s1 h1:RKBBjSBukBF+WIyJx34vXiW1i+owcEMwsd9CgzL5AVY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.27.5-k3s1/go.mod h1:imCCbwtdkqQq1e48br+TMMKRQWA1b2dcnb3yuAZRQ0E= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.27.5-k3s1 h1:fHfYaSv1aeaCEYj1pqwvY+37U9cftwYOVga+1RK5yoE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.27.5-k3s1/go.mod h1:KDPXcl6hV3rFC8wffq2cNbO7epPc7usxhER/5g4Cc+w= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.27.5-k3s1 h1:Ko/Gllmcn4jj8klnyW8jJp9CLKjDe6F3vBKynMDrxZ8= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.27.5-k3s1/go.mod h1:IcPB/5jKQQI4ebDXsQigmOZIiAqlwgtQvIzmxHy3pGQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.27.5-k3s1/go.mod h1:0dF6zBk2bqVelXoKV8HzTSqggL8VwRWGT1IyJ2VmCbs= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.27.5-k3s1 h1:oSOKNlRJzuCktX2a2YO3WbatpFHgQzk4kUbDWDvIPuc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.27.5-k3s1/go.mod h1:J1XjMts5nmpmjnMkgWENknKJZz5XvN82A7S1AJ4qCZ0= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.27.5-k3s1 h1:8JodYWUu0gD9e4iFXBLh8MtuiWczg+ZrUBThPYjWUHE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.27.5-k3s1/go.mod h1:XH/mT02C+kohuNtjlyY/eSIUIKuaeiNC3wX9xkcRW+s= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.27.5-k3s1 h1:8xMojg0wcumXUp0od1ymRaiZUyI8vMt3suayBhMx+cU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.27.5-k3s1/go.mod h1:OhS2nNvxcwT4yrlk1UZL6pJsonPhxwlTLioArEyEDRQ= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.27.5-k3s1 h1:fjfeZLNZCx1IJBkyS4JDr5VDet0CioNkW4hPhez6RXM= -github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.27.5-k3s1/go.mod h1:P3jQ0JFCbQmHTNdnpQ6+rgpBvHW5jRJdpY13LRFk9MY= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.27.5-k3s1 h1:I8RqmekmclI9yZDgS6woyN9DTwmR932U4mJoJqTc8I4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.27.5-k3s1/go.mod h1:5/8Rts1Y3RdeLXtENn7Nhrqgej8paDoX3np17JAZOyU= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.27.5-k3s1 h1:gYcZ13OhAtVT9VB200OgsaGz1zfBc9ilDfykelLyR3I= -github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.27.5-k3s1/go.mod h1:hyAEWqqvYYt7l3JT/F21wp4ziNW+hb1z+fEuUZnCm1A= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.27.5-k3s1 h1:E8AFLZKuGZwyIemNHXa3bv4+wxQA0wS/e0Y3DrNRYoc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.27.5-k3s1/go.mod h1:M2kROdqx5g0WIu2Jx9CjNbWGFoPtoEYxJKqCPT9/784= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.27.5-k3s1 h1:JE1SK0u7OmvcpjupoJKbJaUe3wQ4OpHqO4bx2MvGhdw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.27.5-k3s1/go.mod h1:S1KtzwcSPpYDosTMD0vyAF7Ej1aH2U7NwZvzCDssGoE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.27.5-k3s1 h1:w5rxKHYZH8ayjzwcWD9kfYb8y+40MaAiXHpwTVhSY3w= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.27.5-k3s1/go.mod h1:9B/vExe6qM7Rk9aIP3ziPG+XrOy03uckFClxrfTVjKc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.27.5-k3s1 h1:z/xM/XJYHnh6sSvy2A0pkF5THtHz7qQ93qkhQsI0Bxc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.27.5-k3s1/go.mod h1:Ag2HlDTDvmn4xeMQi1hIh5+maP7jgEujJCrgzA+Db7M= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.27.5-k3s1 h1:YzudY7dQYC0FQBfCwf37VYGsSRCNl8z3lhzfgciSJmo= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.27.5-k3s1/go.mod h1:NWuiMd69LXorPCzxKYhVjLJahLlbiC5c9mraIIXnnVw= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.27.5-k3s1 h1:N5Eb7ja4/S2VAoOp2ZHFScWgqAYzyZuvGRFV2Z6G7AA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.27.5-k3s1/go.mod h1:InWdUp1J2Mrby+8Z3eW/WFrCqJzJMYryv8wowSuCZfA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.27.5-k3s1 h1:OxIrqb/DooaFy/wOzMlbd4x+ar3UBz/wcFkZi1ACUPE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.27.5-k3s1/go.mod h1:+2PiYOYH7dkJbgE5wPq8Kw0GQxWYvtccHJ2L5fX0vsc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.27.5-k3s1 h1:SSePj2T+PzIo+PkNSl7tEul64MZGVFK3zEX4hTqrq0M= -github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.27.5-k3s1/go.mod h1:mwIOl2Auu81bClSDUHsLATcGs0qyhaWWKqEGnqpfPdg= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.27.5-k3s1 h1:35Je5UWXS0Wp1weZAQsQV0477h7L7EP6bxXWewYAqd4= -github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.27.5-k3s1/go.mod h1:+soUGPSCPRv4nKEQeGq3Ky0JLCZMWJXWMYoClMcwh5o= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.27.5-k3s1 h1:kCGjpohynA371LJD1AqWLFRDv8w48yXeot4F8CfraGc= -github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.27.5-k3s1/go.mod h1:vEIRbmVN0BaNdmQw/4ZJx+/j2+Y4Fq6eij7TYGKITOA= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.27.5-k3s1 h1:2ZJbYFZOJKxr+uLa7B79uCpGIRQjZZNwmwLim99+EOE= -github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.27.5-k3s1/go.mod h1:zLV1t5ZWb7sFP6sJQAS3vPZ3lWY9ACXoDSL2y5BDR8g= +github.com/k3s-io/kubernetes v1.27.6-k3s1 h1:8mzZS1+GvgvJ0Leg8rlkS5idyuVfZ+15xiqk1e+liRQ= +github.com/k3s-io/kubernetes v1.27.6-k3s1/go.mod h1:otFZGfN11HvC2Es0PN7FpbkSDRT7LYG7xyc9pCd6f4E= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.27.6-k3s1 h1:jCw+0NCZf96KEv7CGeZX7XVwthGl6Fk5ca4SY43sfhQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.27.6-k3s1/go.mod h1:KwsY6iImdPT12Sn8tPPvvTKtNaynXDjWEhaN+snOcuE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.27.6-k3s1 h1:f5krQR0OpKNXlVWCkxyraR4MZ2jdpO7TXWX/kvehqYo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.27.6-k3s1/go.mod h1:2A8rO6PMhPCeKXTqIjGLIdPxTHzJa1G4OhSPZo2fsGk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.27.6-k3s1 h1:Bxe78szFtFn18IOrqBf7NBa+bHBKAlfL94sYFX7iP4c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.27.6-k3s1/go.mod h1:Osfbq0FOlZe3tVCZPzx7nqzX6fBVrXwQbLq5+63kKzU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.27.6-k3s1 h1:Luf0Agvct7sVYwAplZe041UVsnua/jRZ2B4nnF1kx64= +github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.27.6-k3s1/go.mod h1:8QvstFDuHFGzhXiEyAzQqjS0qrL0Fx2XFzMDE61r/us= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.27.6-k3s1 h1:vIAZlnQKRzfWo/XvT9En2WMzEq2Dbg0n78ryHEuK5nU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.27.6-k3s1/go.mod h1:imCCbwtdkqQq1e48br+TMMKRQWA1b2dcnb3yuAZRQ0E= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.27.6-k3s1 h1:TscvBr8JEptgzhiRsP3He0/Hk6XS1/S1VikxfFwF9g0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.27.6-k3s1/go.mod h1:rz/1bHJXmkRZoXmgPW44YjA396aQSwD7g/+XpCfAFgI= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.27.6-k3s1 h1:FR029B2tA6Lut4i4JN5vGa/iyC7r2fL4NOIkSeQQRJo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.27.6-k3s1/go.mod h1:IcPB/5jKQQI4ebDXsQigmOZIiAqlwgtQvIzmxHy3pGQ= +github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.27.6-k3s1/go.mod h1:0dF6zBk2bqVelXoKV8HzTSqggL8VwRWGT1IyJ2VmCbs= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.27.6-k3s1 h1:CFkYwJZQIytHMg+F3UuTi3rLCTnSd6xAIbP+miXXeJg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.27.6-k3s1/go.mod h1:J1XjMts5nmpmjnMkgWENknKJZz5XvN82A7S1AJ4qCZ0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.27.6-k3s1 h1:3MFzzQfIfH76iyU8hd1VG/5PKkMnrq10la0c1GuUJ5c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.27.6-k3s1/go.mod h1:XH/mT02C+kohuNtjlyY/eSIUIKuaeiNC3wX9xkcRW+s= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.27.6-k3s1 h1:pgWLbPCiBpbnQh8eYvUmX6GXtThmDPzBsDmcexReq50= +github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.27.6-k3s1/go.mod h1:wGNNzxOoTqDpNro+buONGC/QB0iw/njVOyMUHd7HskA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.27.6-k3s1 h1:1tukb1uxoAkzfIlzBE/UuCh5wbsGZId8z0uHT0blB7g= +github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.27.6-k3s1/go.mod h1:P3jQ0JFCbQmHTNdnpQ6+rgpBvHW5jRJdpY13LRFk9MY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.27.6-k3s1 h1:kvF/zYbk8pkE1PYUdYcmNcgaCStVVu6/mIBhZFsjvvo= +github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.27.6-k3s1/go.mod h1:5/8Rts1Y3RdeLXtENn7Nhrqgej8paDoX3np17JAZOyU= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.27.6-k3s1 h1:3K4kGGw4r116sQ70JSPnetbizLZhYM7sziqXPqROzX8= +github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.27.6-k3s1/go.mod h1:hyAEWqqvYYt7l3JT/F21wp4ziNW+hb1z+fEuUZnCm1A= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.27.6-k3s1 h1:+l0zLLNIVw+7mOQcplG84Ogoh9uTg1J6GEya54T4n3g= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.27.6-k3s1/go.mod h1:M2kROdqx5g0WIu2Jx9CjNbWGFoPtoEYxJKqCPT9/784= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.27.6-k3s1 h1:YFNN5Px1B9181OrTsscrX2iH6Uq6Z1aHvWcIopSSTxk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.27.6-k3s1/go.mod h1:5sVQZhu2XGBH2QnBrwl5wq519dqm4845SvDZ/pvXEPY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.27.6-k3s1 h1:/jbYUAaQEcw/WajHeCXbAN/Az1+ktubBunNg4ZIoxIk= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.27.6-k3s1/go.mod h1:9B/vExe6qM7Rk9aIP3ziPG+XrOy03uckFClxrfTVjKc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.27.6-k3s1 h1:2myVypHrwEUCRcFwWj27MvPh5CsG4adEKSCRDdZJT+k= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.27.6-k3s1/go.mod h1:Ag2HlDTDvmn4xeMQi1hIh5+maP7jgEujJCrgzA+Db7M= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.27.6-k3s1 h1:wYYnd3YOzfOMGT8weJBRbBLD20NWeb4g8OxACwAvDdA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.27.6-k3s1/go.mod h1:NWuiMd69LXorPCzxKYhVjLJahLlbiC5c9mraIIXnnVw= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.27.6-k3s1 h1:k4cWFnLiIFZk0OVcjRV2ZgOcFIhN0d3XXI5YcK8/hvA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.27.6-k3s1/go.mod h1:InWdUp1J2Mrby+8Z3eW/WFrCqJzJMYryv8wowSuCZfA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.27.6-k3s1 h1:HiyRKwPu1SrGAVqkT/7bg5hDk2tP1Uaan8dOwdHRZ0c= +github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.27.6-k3s1/go.mod h1:+2PiYOYH7dkJbgE5wPq8Kw0GQxWYvtccHJ2L5fX0vsc= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.27.6-k3s1 h1:0CSjjlPOQq075ButlsqQgxXwYpDaLuJ0gXGxhZaVfLY= +github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.27.6-k3s1/go.mod h1:mwIOl2Auu81bClSDUHsLATcGs0qyhaWWKqEGnqpfPdg= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.27.6-k3s1 h1:KQt1csRCsdxO3RTONMFXtrthNNWpMdIMKeiGsCHU1Ik= +github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.27.6-k3s1/go.mod h1:+soUGPSCPRv4nKEQeGq3Ky0JLCZMWJXWMYoClMcwh5o= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.27.6-k3s1 h1:gAn4HYEr7wqNQGSxnqDMiIZxIDnMlv3USvV7cJ1kjW0= +github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.27.6-k3s1/go.mod h1:vEIRbmVN0BaNdmQw/4ZJx+/j2+Y4Fq6eij7TYGKITOA= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.27.6-k3s1 h1:b80vCi4F5E8YOz5YPNbq6nJpPmU7wisK96esZXOXmYE= +github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.27.6-k3s1/go.mod h1:Qdy2Dm5wCOX9MB7N7Sffr+PqH8Hg2TxUuMQDawSmSEw= 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= @@ -2007,4 +2008,3 @@ sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= -vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/pkg/cli/cmds/cert.go b/pkg/cli/cmds/cert.go index d934b87917..6102a9f237 100644 --- a/pkg/cli/cmds/cert.go +++ b/pkg/cli/cmds/cert.go @@ -6,30 +6,10 @@ import ( "github.com/k3s-io/k3s/pkg/cli/cert" "github.com/k3s-io/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/configfilearg" - "github.com/k3s-io/k3s/pkg/version" "github.com/rancher/rke2/pkg/rke2" "github.com/urfave/cli" ) -var certSubcommands = []cli.Command{ - { - Name: "rotate", - Usage: "Rotate " + version.Program + " component certificates on disk", - SkipFlagParsing: false, - SkipArgReorder: true, - Action: Rotate, - Flags: cmds.CertRotateCommandFlags, - }, - { - Name: "rotate-ca", - Usage: "Write updated " + version.Program + " CA certificates to the datastore", - SkipFlagParsing: false, - SkipArgReorder: true, - Action: cert.RotateCA, - Flags: cmds.CertRotateCACommandFlags, - }, -} - func NewCertCommand() cli.Command { k3sOpts := K3SFlagSet{} subCommandOpts := map[string]K3SFlagSet{ @@ -57,7 +37,7 @@ func NewCertCommand() cli.Command { }, } - command := cmds.NewCertCommand(certSubcommands) + command := cmds.NewCertCommands(Rotate, cert.RotateCA) command.Usage = "Manage RKE2 certificates" configfilearg.DefaultParser.ValidFlags[command.Name] = command.Flags for i, subcommand := range command.Subcommands { diff --git a/pkg/cli/cmds/etcd_snapshot.go b/pkg/cli/cmds/etcd_snapshot.go index b35460f15b..09c2d50383 100644 --- a/pkg/cli/cmds/etcd_snapshot.go +++ b/pkg/cli/cmds/etcd_snapshot.go @@ -10,7 +10,7 @@ import ( const defaultSnapshotRentention = 5 func NewEtcdSnapshotCommand() cli.Command { - cmds.ServerConfig.DatastoreEndpoint = "etcd" + cmds.ServerConfig.ClusterInit = true k3sOpts := K3SFlagSet{ "config": copyFlag, "debug": copyFlag, diff --git a/pkg/cli/cmds/token.go b/pkg/cli/cmds/token.go index e2acdb90d6..4cca3f1631 100644 --- a/pkg/cli/cmds/token.go +++ b/pkg/cli/cmds/token.go @@ -25,9 +25,16 @@ func NewTokenCommand() cli.Command { "list": { "output": copyFlag, }, + "rotate": { + "token": copyFlag, + "new-token": copyFlag, + "server": { + Default: "https://127.0.0.1:9345", + }, + }, } - command := cmds.NewTokenCommands(token.Create, token.Delete, token.Generate, token.List) + command := cmds.NewTokenCommands(token.Create, token.Delete, token.Generate, token.List, token.Rotate) configfilearg.DefaultParser.ValidFlags[command.Name] = command.Flags for i, subcommand := range command.Subcommands { if s, ok := subCommandOpts[subcommand.Name]; ok { diff --git a/pkg/cli/defaults/defaults.go b/pkg/cli/defaults/defaults.go index bcdb1ebc90..1db87c2ec9 100644 --- a/pkg/cli/defaults/defaults.go +++ b/pkg/cli/defaults/defaults.go @@ -17,7 +17,7 @@ func Set(_ *cli.Context, dataDir string) error { return errors.Wrapf(err, "failed to create directory %s", logsDir) } - cmds.ServerConfig.DatastoreEndpoint = "etcd" + cmds.ServerConfig.ClusterInit = true cmds.ServerConfig.DisableNPC = true cmds.ServerConfig.FlannelBackend = "none" cmds.ServerConfig.AdvertisePort = 6443 diff --git a/scripts/build-images b/scripts/build-images index 6220eaee61..9350a04486 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -35,18 +35,18 @@ EOF if [ "${GOARCH}" != "s390x" ] && [ "${GOARCH}" != "arm64" ]; then xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt - ${REGISTRY}/rancher/mirrored-cilium-certgen:v0.1.8 - ${REGISTRY}/rancher/mirrored-cilium-cilium:v1.14.1 - ${REGISTRY}/rancher/mirrored-cilium-cilium-envoy:v1.25.9-f039e2bd380b7eef2f2feea5750676bb36133699 + ${REGISTRY}/rancher/mirrored-cilium-certgen:v0.1.9 + ${REGISTRY}/rancher/mirrored-cilium-cilium:v1.14.2 + ${REGISTRY}/rancher/mirrored-cilium-cilium-envoy:v1.25.9-e198a2824d309024cb91fb6a984445e73033291d ${REGISTRY}/rancher/mirrored-cilium-cilium-etcd-operator:v2.0.7 - ${REGISTRY}/rancher/mirrored-cilium-clustermesh-apiserver:v1.14.1 - ${REGISTRY}/rancher/mirrored-cilium-hubble-relay:v1.14.1 + ${REGISTRY}/rancher/mirrored-cilium-clustermesh-apiserver:v1.14.2 + ${REGISTRY}/rancher/mirrored-cilium-hubble-relay:v1.14.2 ${REGISTRY}/rancher/mirrored-cilium-hubble-ui:v0.12.0 ${REGISTRY}/rancher/mirrored-cilium-hubble-ui-backend:v0.12.0 - ${REGISTRY}/rancher/mirrored-cilium-kvstoremesh:v1.14.1 - ${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.14.1 - ${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.14.1 - ${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.14.1 + ${REGISTRY}/rancher/mirrored-cilium-kvstoremesh:v1.14.2 + ${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.14.2 + ${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.14.2 + ${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.14.2 ${REGISTRY}/rancher/hardened-cni-plugins:v1.2.0-build20230523 EOF