diff --git a/Dockerfile b/Dockerfile index 049d34c4b3..710dd505af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -122,7 +122,7 @@ RUN CHART_VERSION="v3.26.1-build2023080200" CHART_FILE=/charts/rke2-canal.yaml 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 RUN CHART_VERSION="1.24.006" CHART_FILE=/charts/rke2-coredns.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh -RUN CHART_VERSION="4.6.101" CHART_FILE=/charts/rke2-ingress-nginx.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh +RUN CHART_VERSION="4.8.200" CHART_FILE=/charts/rke2-ingress-nginx.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh RUN CHART_VERSION="2.11.100-build2023051510" CHART_FILE=/charts/rke2-metrics-server.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh RUN CHART_VERSION="v4.0.2-build2023081100" 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 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/scripts/build-images b/scripts/build-images index 3dc43f021a..34f99cf217 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -22,7 +22,7 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt ${REGISTRY}/rancher/klipper-lb:v0.4.4 ${REGISTRY}/rancher/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.7.1-hardened1 + ${REGISTRY}/rancher/nginx-ingress-controller:nginx-1.9.3-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.2