Skip to content

Commit

Permalink
Bump charts and chart images
Browse files Browse the repository at this point in the history 
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit e9e8de0)
  • Loading branch information
@brandond
brandond committed Nov 29, 2021
1 parent 8b49af8 commit bcce749
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
14 changes: 7 additions & 7 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,17 @@ ARG CACHEBUST="cachebust"
COPY charts/ /charts/
RUN echo ${CACHEBUST}>/dev/null
RUN CHART_VERSION="1.10.404" CHART_FILE=/charts/rke2-cilium.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="v3.20.1-build2021100603" CHART_FILE=/charts/rke2-canal.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="v3.20.1-build2021111904" CHART_FILE=/charts/rke2-canal.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="v3.20.201" CHART_FILE=/charts/rke2-calico.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="v1.0.202" CHART_FILE=/charts/rke2-calico-crd.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="1.16.301-build2021100602" CHART_FILE=/charts/rke2-coredns.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="4.0.305" CHART_FILE=/charts/rke2-ingress-nginx.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh
RUN CHART_VERSION="1.16.401-build2021111901" CHART_FILE=/charts/rke2-coredns.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="4.0.306" CHART_FILE=/charts/rke2-ingress-nginx.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh
RUN CHART_VERSION="v1.21.6-rke2r2-build2021111501" \
CHART_PACKAGE="rke2-kube-proxy-1.21" CHART_FILE=/charts/rke2-kube-proxy.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="2.11.100-build2021022302" CHART_FILE=/charts/rke2-metrics-server.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh
RUN CHART_VERSION="v3.7.1-build2021041604" CHART_FILE=/charts/rke2-multus.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="100.0.0" CHART_FILE=/charts/rancher-vsphere-cpi.yaml CHART_BOOTSTRAP=true CHART_REPO="https://charts.rancher.io" /charts/build-chart.sh
RUN CHART_VERSION="100.0.0" CHART_FILE=/charts/rancher-vsphere-csi.yaml CHART_BOOTSTRAP=true CHART_REPO="https://charts.rancher.io" /charts/build-chart.sh
RUN CHART_VERSION="2.11.100-build2021111904" CHART_FILE=/charts/rke2-metrics-server.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh
RUN CHART_VERSION="v3.7.1-build2021111906" CHART_FILE=/charts/rke2-multus.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="100.1.0+up1.0.100" CHART_FILE=/charts/rancher-vsphere-cpi.yaml CHART_BOOTSTRAP=true CHART_REPO="https://charts.rancher.io" /charts/build-chart.sh
RUN CHART_VERSION="100.1.0+up2.3.0" CHART_FILE=/charts/rancher-vsphere-csi.yaml CHART_BOOTSTRAP=true CHART_REPO="https://charts.rancher.io" /charts/build-chart.sh
RUN CHART_VERSION="0.1.300" CHART_FILE=/charts/harvester-cloud-provider.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="0.1.400" CHART_FILE=/charts/harvester-csi-driver.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN rm -vf /charts/*.sh /charts/*.md
Expand Down
24 changes: 12 additions & 12 deletions scripts/build-images
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ EOF

xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt
${REGISTRY}/rancher/hardened-kubernetes:${KUBERNETES_IMAGE_TAG}
${REGISTRY}/rancher/hardened-coredns:v1.8.5-build20211006
${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.8.5-build20211006
${REGISTRY}/rancher/hardened-dns-node-cache:1.21.1-build20211006
${REGISTRY}/rancher/hardened-coredns:v1.8.5-build20211119
${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.8.5-build20211119
${REGISTRY}/rancher/hardened-dns-node-cache:1.21.2-build20211119
${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-${IMAGE_BUILD_VERSION}
${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.3.6-${IMAGE_BUILD_VERSION}
${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.5.0-build20211119
${REGISTRY}/rancher/klipper-helm:v0.6.6-build20211022
${REGISTRY}/rancher/pause:${PAUSE_VERSION}
${REGISTRY}/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.0
${REGISTRY}/rancher/nginx-ingress-controller:nginx-1.0.2-hardened1
${REGISTRY}/rancher/nginx-ingress-controller:nginx-1.0.2-hardened2
${REGISTRY}/rancher/rke2-cloud-provider:${CCM_VERSION}
EOF

xargs -n1 -t docker image pull --quiet << EOF > build/images-canal.txt
${REGISTRY}/rancher/hardened-calico:v3.20.1-build20211006
${REGISTRY}/rancher/hardened-flannel:v0.15.1-build20211021
${REGISTRY}/rancher/hardened-calico:v3.20.2-build20211119
${REGISTRY}/rancher/hardened-flannel:v0.15.1-build20211119
EOF

xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt
Expand All @@ -50,14 +50,14 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-calico.txt
EOF

xargs -n1 -t docker image pull --quiet << EOF > build/images-vsphere.txt
${REGISTRY}/rancher/mirrored-cloud-provider-vsphere-cpi-release-manager:v1.2.1
${REGISTRY}/rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v2.2.1
${REGISTRY}/rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v2.2.1
${REGISTRY}/rancher/mirrored-k8scsi-csi-attacher:v3.1.0
${REGISTRY}/rancher/mirrored-cloud-provider-vsphere-cpi-release-manager:v1.21.0
${REGISTRY}/rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v2.3.0
${REGISTRY}/rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v2.3.0
${REGISTRY}/rancher/mirrored-k8scsi-csi-node-driver-registrar:v2.1.0
${REGISTRY}/rancher/mirrored-k8scsi-csi-provisioner:v2.1.0
${REGISTRY}/rancher/mirrored-k8scsi-csi-resizer:v1.1.0
${REGISTRY}/rancher/mirrored-k8scsi-livenessprobe:v2.2.0
${REGISTRY}/rancher/mirrored-sig-storage-csi-attacher:v3.2.0
${REGISTRY}/rancher/mirrored-sig-storage-csi-provisioner:v2.2.0
EOF

xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt
Expand Down
2 changes: 1 addition & 1 deletion scripts/version.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ PAUSE_VERSION=${PAUSE_VERSION:-3.6}
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.21.6}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.21.6-rke2r2-build20211115}
ETCD_VERSION=${ETCD_VERSION:-v3.4.13-k3s1}
CCM_VERSION=${CCM_VERSION:-v0.0.1-build20210629}
CCM_VERSION=${CCM_VERSION:-v0.0.3-build20211118}
IMAGE_BUILD_VERSION=${IMAGE_BUILD_VERSION:-build20210223}

if [ -d .git ]; then
Expand Down

0 comments on commit bcce749

Please sign in to comment.