From e276402663e5e36610fdc6575ff0ec5975d790c0 Mon Sep 17 00:00:00 2001 From: Erik Wilson Date: Wed, 24 Feb 2021 12:53:23 -0700 Subject: [PATCH] Update hardened images --- packages/rke2-canal/charts/Chart.yaml | 2 +- packages/rke2-canal/charts/values.yaml | 8 ++++---- packages/rke2-coredns/rke2-coredns.patch | 5 +++-- packages/rke2-kube-proxy/charts/Chart.yaml | 4 ++-- packages/rke2-kube-proxy/charts/values.yaml | 2 +- packages/rke2-metrics-server/rke2-metrics-server.patch | 6 ++++-- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/packages/rke2-canal/charts/Chart.yaml b/packages/rke2-canal/charts/Chart.yaml index 622ce3e..69e3d3f 100644 --- a/packages/rke2-canal/charts/Chart.yaml +++ b/packages/rke2-canal/charts/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: rke2-canal description: Install Canal Network Plugin. -version: v3.13.3 +version: v3.13.300-build20210223 appVersion: v3.13.3 home: https://www.projectcalico.org/ keywords: diff --git a/packages/rke2-canal/charts/values.yaml b/packages/rke2-canal/charts/values.yaml index 1bb70a0..8730b96 100644 --- a/packages/rke2-canal/charts/values.yaml +++ b/packages/rke2-canal/charts/values.yaml @@ -8,7 +8,7 @@ flannel: # kube-flannel image image: repository: rancher/hardened-flannel - tag: v0.13.0-rancher1 + tag: v0.13.0-rancher1-build20210223 # The interface used by canal for host <-> host communication. # If left blank, then the interface is chosen using the node's # default route. @@ -25,15 +25,15 @@ calico: # CNI installation image. cniImage: repository: rancher/hardened-calico - tag: v3.13.3 + tag: v3.13.3-build20210223 # Canal node image. nodeImage: repository: rancher/hardened-calico - tag: v3.13.3 + tag: v3.13.3-build20210223 # Flexvol Image. flexvolImage: repository: rancher/hardened-calico - tag: v3.13.3 + tag: v3.13.3-build20210223 # Datastore type for canal. It can be either kuberentes or etcd. datastoreType: kubernetes # Wait for datastore to initialize. diff --git a/packages/rke2-coredns/rke2-coredns.patch b/packages/rke2-coredns/rke2-coredns.patch index 90e7b8d..db142a8 100644 --- a/packages/rke2-coredns/rke2-coredns.patch +++ b/packages/rke2-coredns/rke2-coredns.patch @@ -9,7 +9,8 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/Chart.yam +name: rke2-coredns sources: - https://github.com/coredns/coredns - version: 1.10.1 +-version: 1.10.1 ++version: 1.10.101-build20210223 diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/templates/_helpers.tpl packages/rke2-coredns/charts/templates/_helpers.tpl --- packages/rke2-coredns/charts-original/templates/_helpers.tpl +++ packages/rke2-coredns/charts/templates/_helpers.tpl @@ -351,7 +352,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/values.ya - repository: coredns/coredns - tag: "1.6.9" + repository: rancher/hardened-coredns -+ tag: "v1.6.9" ++ tag: "v1.6.9-build20210223" pullPolicy: IfNotPresent replicaCount: 1 diff --git a/packages/rke2-kube-proxy/charts/Chart.yaml b/packages/rke2-kube-proxy/charts/Chart.yaml index 3ad9e1e..367c94e 100644 --- a/packages/rke2-kube-proxy/charts/Chart.yaml +++ b/packages/rke2-kube-proxy/charts/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: rke2-kube-proxy description: Install Kube Proxy. -version: v1.18.16 -appVersion: v1.18.16 +version: v1.19.8 +appVersion: v1.19.8 keywords: - kube-proxy sources: diff --git a/packages/rke2-kube-proxy/charts/values.yaml b/packages/rke2-kube-proxy/charts/values.yaml index 32d2f92..e362472 100644 --- a/packages/rke2-kube-proxy/charts/values.yaml +++ b/packages/rke2-kube-proxy/charts/values.yaml @@ -3,7 +3,7 @@ # image for kubeproxy image: repository: rancher/hardened-kube-proxy - tag: v1.18.16 + tag: v1.19.8 # The IP address for the proxy server to serve on # (set to '0.0.0.0' for all IPv4 interfaces and '::' for all IPv6 interfaces) diff --git a/packages/rke2-metrics-server/rke2-metrics-server.patch b/packages/rke2-metrics-server/rke2-metrics-server.patch index e7307b9..76840e9 100644 --- a/packages/rke2-metrics-server/rke2-metrics-server.patch +++ b/packages/rke2-metrics-server/rke2-metrics-server.patch @@ -9,7 +9,8 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-metrics-server/charts-original/Ch +name: rke2-metrics-server sources: - https://github.com/kubernetes-incubator/metrics-server - version: 2.11.1 +-version: 2.11.1 ++version: 2.11.100-build20210223 diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-metrics-server/charts-original/templates/_helpers.tpl packages/rke2-metrics-server/charts/templates/_helpers.tpl --- packages/rke2-metrics-server/charts-original/templates/_helpers.tpl +++ packages/rke2-metrics-server/charts/templates/_helpers.tpl @@ -45,8 +46,9 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-metrics-server/charts-original/va image: - repository: k8s.gcr.io/metrics-server-amd64 +- tag: v0.3.6 + repository: rancher/hardened-k8s-metrics-server - tag: v0.3.6 ++ tag: v0.3.6-build20210223 pullPolicy: IfNotPresent imagePullSecrets: []