diff --git a/assets/index.yaml b/assets/index.yaml index 0fb31aa..ee896b9 100644 --- a/assets/index.yaml +++ b/assets/index.yaml @@ -3,9 +3,9 @@ entries: rke2-canal: - apiVersion: v1 appVersion: v3.13.3 - created: "2020-12-07T21:17:34.241969589Z" + created: "2020-12-17T00:41:06.133781035Z" description: Install Canal Network Plugin. - digest: 39be2f9b072c8ae6561f5458a04b563bf2c9fe05cb960cb745c1015145c0d5cf + digest: 78b6c6debe8207055181ecee36162c65aa487a23558419bc06b53a92d8a5b077 home: https://www.projectcalico.org/ keywords: - canal @@ -21,10 +21,10 @@ entries: rke2-coredns: - apiVersion: v1 appVersion: 1.7.1 - created: "2020-12-14T23:50:52.476722742Z" + created: "2020-12-17T00:41:06.135209637Z" description: CoreDNS is a DNS server that chains plugins and provides Kubernetes DNS Services - digest: decc787dff7c3d447075896b818e0c71ed1c7518384bddb39af06e603ffa1cde + digest: 638d62257ef168967f52a09f9083896d1f0dbc16bf55781251dbd2c94a4704bd home: https://coredns.io icon: https://coredns.io/images/CoreDNS_Colour_Horizontal.png keywords: @@ -90,9 +90,9 @@ entries: rke2-kube-proxy: - apiVersion: v1 appVersion: v1.19.5 - created: "2020-12-12T00:22:50.511760091Z" + created: "2020-12-17T00:41:06.136298239Z" description: Install Kube Proxy. - digest: 49dc2a30ae5ddb9896da6881c31760557403ebd26c69a6291852b4f1288fae9c + digest: 895de1301374dc3cee29aa8f39af0349a53532abefcb3f2b55f75de3c5bb8b03 keywords: - kube-proxy maintainers: @@ -203,9 +203,9 @@ entries: rke2-metrics-server: - apiVersion: v1 appVersion: 0.3.6 - created: "2020-12-07T21:17:34.245675966Z" + created: "2020-12-17T00:41:06.13713324Z" description: Metrics Server is a cluster-wide aggregator of resource usage data. - digest: e8f6c8b340f28204dce4887a5ccb10509d190ccaee645ebaad7a0d5a90ab3c45 + digest: 87715a302acc4229bba04200b3f607f2a1bb5d3c507b436194df7fb4ac219abd home: https://github.com/kubernetes-incubator/metrics-server keywords: - metrics-server @@ -220,4 +220,4 @@ entries: urls: - assets/rke2-metrics-server/rke2-metrics-server-2.11.100.tgz version: 2.11.100 -generated: "2020-12-14T23:50:52.472261046Z" +generated: "2020-12-17T00:41:06.132928334Z" diff --git a/assets/rke2-canal/rke2-canal-v3.13.3.tgz b/assets/rke2-canal/rke2-canal-v3.13.3.tgz index 2325d09..a37b01c 100644 Binary files a/assets/rke2-canal/rke2-canal-v3.13.3.tgz and b/assets/rke2-canal/rke2-canal-v3.13.3.tgz differ diff --git a/assets/rke2-coredns/rke2-coredns-1.13.800.tgz b/assets/rke2-coredns/rke2-coredns-1.13.800.tgz index 0b03859..c188dc4 100644 Binary files a/assets/rke2-coredns/rke2-coredns-1.13.800.tgz and b/assets/rke2-coredns/rke2-coredns-1.13.800.tgz differ diff --git a/assets/rke2-kube-proxy/rke2-kube-proxy-v1.19.5.tgz b/assets/rke2-kube-proxy/rke2-kube-proxy-v1.19.5.tgz index f90c34a..da6b4cd 100644 Binary files a/assets/rke2-kube-proxy/rke2-kube-proxy-v1.19.5.tgz and b/assets/rke2-kube-proxy/rke2-kube-proxy-v1.19.5.tgz differ diff --git a/assets/rke2-metrics-server/rke2-metrics-server-2.11.100.tgz b/assets/rke2-metrics-server/rke2-metrics-server-2.11.100.tgz index c914bdf..70a5f2d 100644 Binary files a/assets/rke2-metrics-server/rke2-metrics-server-2.11.100.tgz and b/assets/rke2-metrics-server/rke2-metrics-server-2.11.100.tgz differ diff --git a/charts/rke2-kube-proxy/templates/_helpers.tpl b/charts/rke2-kube-proxy/templates/_helpers.tpl index b647c75..27f12fc 100755 --- a/charts/rke2-kube-proxy/templates/_helpers.tpl +++ b/charts/rke2-kube-proxy/templates/_helpers.tpl @@ -5,3 +5,10 @@ {{- "" -}} {{- end -}} {{- end -}} +{{- define "rke2_data_dir" -}} +{{- if .Values.global.rke2DataDir -}} +{{- printf "%s" .Values.global.rke2DataDir -}} +{{- else -}} +{{- "/var/lib/rancher/rke2" -}} +{{- end -}} +{{- end -}} diff --git a/charts/rke2-kube-proxy/templates/daemonset.yaml b/charts/rke2-kube-proxy/templates/daemonset.yaml index 6a65734..03a3727 100644 --- a/charts/rke2-kube-proxy/templates/daemonset.yaml +++ b/charts/rke2-kube-proxy/templates/daemonset.yaml @@ -58,7 +58,7 @@ spec: - operator: Exists volumes: - hostPath: - path: /var/lib/rancher/rke2/agent + path: {{ template "rke2_data_dir" . }}/agent type: "" name: rke2config - configMap: diff --git a/index.yaml b/index.yaml index 0fb31aa..ee896b9 100644 --- a/index.yaml +++ b/index.yaml @@ -3,9 +3,9 @@ entries: rke2-canal: - apiVersion: v1 appVersion: v3.13.3 - created: "2020-12-07T21:17:34.241969589Z" + created: "2020-12-17T00:41:06.133781035Z" description: Install Canal Network Plugin. - digest: 39be2f9b072c8ae6561f5458a04b563bf2c9fe05cb960cb745c1015145c0d5cf + digest: 78b6c6debe8207055181ecee36162c65aa487a23558419bc06b53a92d8a5b077 home: https://www.projectcalico.org/ keywords: - canal @@ -21,10 +21,10 @@ entries: rke2-coredns: - apiVersion: v1 appVersion: 1.7.1 - created: "2020-12-14T23:50:52.476722742Z" + created: "2020-12-17T00:41:06.135209637Z" description: CoreDNS is a DNS server that chains plugins and provides Kubernetes DNS Services - digest: decc787dff7c3d447075896b818e0c71ed1c7518384bddb39af06e603ffa1cde + digest: 638d62257ef168967f52a09f9083896d1f0dbc16bf55781251dbd2c94a4704bd home: https://coredns.io icon: https://coredns.io/images/CoreDNS_Colour_Horizontal.png keywords: @@ -90,9 +90,9 @@ entries: rke2-kube-proxy: - apiVersion: v1 appVersion: v1.19.5 - created: "2020-12-12T00:22:50.511760091Z" + created: "2020-12-17T00:41:06.136298239Z" description: Install Kube Proxy. - digest: 49dc2a30ae5ddb9896da6881c31760557403ebd26c69a6291852b4f1288fae9c + digest: 895de1301374dc3cee29aa8f39af0349a53532abefcb3f2b55f75de3c5bb8b03 keywords: - kube-proxy maintainers: @@ -203,9 +203,9 @@ entries: rke2-metrics-server: - apiVersion: v1 appVersion: 0.3.6 - created: "2020-12-07T21:17:34.245675966Z" + created: "2020-12-17T00:41:06.13713324Z" description: Metrics Server is a cluster-wide aggregator of resource usage data. - digest: e8f6c8b340f28204dce4887a5ccb10509d190ccaee645ebaad7a0d5a90ab3c45 + digest: 87715a302acc4229bba04200b3f607f2a1bb5d3c507b436194df7fb4ac219abd home: https://github.com/kubernetes-incubator/metrics-server keywords: - metrics-server @@ -220,4 +220,4 @@ entries: urls: - assets/rke2-metrics-server/rke2-metrics-server-2.11.100.tgz version: 2.11.100 -generated: "2020-12-14T23:50:52.472261046Z" +generated: "2020-12-17T00:41:06.132928334Z" diff --git a/sha256sum/rke2-canal/rke2-canal.sum b/sha256sum/rke2-canal/rke2-canal.sum index fb6fc74..1781a95 100644 --- a/sha256sum/rke2-canal/rke2-canal.sum +++ b/sha256sum/rke2-canal/rke2-canal.sum @@ -1,9 +1,9 @@ -04a3caab7086b0fef6894bf8f9c29d7eecefad1cf3eaed4742e9305cfc9f6b8a packages/rke2-canal/charts/templates/serviceaccount.yaml -707744e262fccd7ff3e9e138be55aebedba32a29206deb0948d97b0ea9f0f08d packages/rke2-canal/charts/templates/crd.yaml -90f1d8a3a944e4b0fde9f2842b2a3531a95102d5ce3e3a893652e200c26b947f packages/rke2-canal/charts/templates/_helpers.tpl -ebbce05e2f4f53227016183e3638bbd576897598b91639ce3942bc738e7ec15c packages/rke2-canal/charts/templates/config.yaml -bf4bfa1018dda5895521ac50a4a6102d6f3a1659e9c52a37b70b4b8001452ea1 packages/rke2-canal/charts/templates/NOTES.txt +fa375266acef30442bc6120a91178721d5bc27b6c4fc6241a066cd46a93f55e7 packages/rke2-canal/charts/values.yaml +e395fb6c35448ff727affec5f952a8112560e40d00ef78ebcd9814c8a8f21558 packages/rke2-canal/charts/Chart.yaml 7878a574ad9f673266ce585d3688428796e3e182a7f672026258ef6b92393dd0 packages/rke2-canal/charts/templates/daemonset.yaml ac1baa8b6d7b02c713b80bc38a853d7a8c70f67847f08f1c5e81d4157ccf85e4 packages/rke2-canal/charts/templates/rbac.yaml -e395fb6c35448ff727affec5f952a8112560e40d00ef78ebcd9814c8a8f21558 packages/rke2-canal/charts/Chart.yaml -fa375266acef30442bc6120a91178721d5bc27b6c4fc6241a066cd46a93f55e7 packages/rke2-canal/charts/values.yaml +707744e262fccd7ff3e9e138be55aebedba32a29206deb0948d97b0ea9f0f08d packages/rke2-canal/charts/templates/crd.yaml +90f1d8a3a944e4b0fde9f2842b2a3531a95102d5ce3e3a893652e200c26b947f packages/rke2-canal/charts/templates/_helpers.tpl +bf4bfa1018dda5895521ac50a4a6102d6f3a1659e9c52a37b70b4b8001452ea1 packages/rke2-canal/charts/templates/NOTES.txt +ebbce05e2f4f53227016183e3638bbd576897598b91639ce3942bc738e7ec15c packages/rke2-canal/charts/templates/config.yaml +04a3caab7086b0fef6894bf8f9c29d7eecefad1cf3eaed4742e9305cfc9f6b8a packages/rke2-canal/charts/templates/serviceaccount.yaml diff --git a/sha256sum/rke2-coredns/rke2-coredns.sum b/sha256sum/rke2-coredns/rke2-coredns.sum index bbaf4cd..51ac360 100644 --- a/sha256sum/rke2-coredns/rke2-coredns.sum +++ b/sha256sum/rke2-coredns/rke2-coredns.sum @@ -1,2 +1,2 @@ -e69f832959104562bebfeb213427868ec75e3c765c467bc16023eb48ed886bb6 packages/rke2-coredns/rke2-coredns.patch 23c356b184a5b9a13c464ada2fcebd80c0abed8793d685586adb821d41751d1b packages/rke2-coredns/package.yaml +e69f832959104562bebfeb213427868ec75e3c765c467bc16023eb48ed886bb6 packages/rke2-coredns/rke2-coredns.patch diff --git a/sha256sum/rke2-kube-proxy/rke2-kube-proxy.sum b/sha256sum/rke2-kube-proxy/rke2-kube-proxy.sum index 8955f24..fb7cbb6 100644 --- a/sha256sum/rke2-kube-proxy/rke2-kube-proxy.sum +++ b/sha256sum/rke2-kube-proxy/rke2-kube-proxy.sum @@ -1,8 +1,8 @@ -d1de4d515c8b9d215a9410a4c7ce04b0593583f9edaa16ea3a5b939ed6d44560 packages/rke2-kube-proxy/charts/templates/serviceaccount.yaml -90f1d8a3a944e4b0fde9f2842b2a3531a95102d5ce3e3a893652e200c26b947f packages/rke2-kube-proxy/charts/templates/_helpers.tpl -9f849e20cec7b851d02757476ad4c6f050b055abb8ccc5c20209b91ddf159936 packages/rke2-kube-proxy/charts/templates/config.yaml -41b28ddbe82a714e88b3e3f62bd1f96b794f02384a560c7d21b4a0d680400451 packages/rke2-kube-proxy/charts/templates/NOTES.txt -5a5fac162b101d21f166226a4269d30371b374e8132a2bc8c3ff4403622df098 packages/rke2-kube-proxy/charts/templates/daemonset.yaml -3ea61d8092a4c6841e1a28d9b5db86110a263b693fb2845679cd2fc1891b5763 packages/rke2-kube-proxy/charts/templates/rbac.yaml -fd16e5b22564759f17f5dfd93f0417aaa289ffc0850ea9b02d1745a8454f3e68 packages/rke2-kube-proxy/charts/Chart.yaml 06754908e26e39bf2578adbe18fbf903a37b3b37fd8beb72c77adcc2cc1e487c packages/rke2-kube-proxy/charts/values.yaml +fd16e5b22564759f17f5dfd93f0417aaa289ffc0850ea9b02d1745a8454f3e68 packages/rke2-kube-proxy/charts/Chart.yaml +3769abf3bfd44278a2c19880247d47d861dbafb14ad222c64cd52a6bb25d856f packages/rke2-kube-proxy/charts/templates/daemonset.yaml +3ea61d8092a4c6841e1a28d9b5db86110a263b693fb2845679cd2fc1891b5763 packages/rke2-kube-proxy/charts/templates/rbac.yaml +7ee66c966479b1ab944b4bf3af7fc6b7901873ffacc5c0944856945507e4567e packages/rke2-kube-proxy/charts/templates/_helpers.tpl +41b28ddbe82a714e88b3e3f62bd1f96b794f02384a560c7d21b4a0d680400451 packages/rke2-kube-proxy/charts/templates/NOTES.txt +9f849e20cec7b851d02757476ad4c6f050b055abb8ccc5c20209b91ddf159936 packages/rke2-kube-proxy/charts/templates/config.yaml +d1de4d515c8b9d215a9410a4c7ce04b0593583f9edaa16ea3a5b939ed6d44560 packages/rke2-kube-proxy/charts/templates/serviceaccount.yaml diff --git a/sha256sum/rke2-metrics-server/rke2-metrics-server.sum b/sha256sum/rke2-metrics-server/rke2-metrics-server.sum index 6c39f51..ba99307 100644 --- a/sha256sum/rke2-metrics-server/rke2-metrics-server.sum +++ b/sha256sum/rke2-metrics-server/rke2-metrics-server.sum @@ -1,2 +1,2 @@ -c58b6bd881ebf4e3a95742f5daefba8c11dcdb5bcbbde3f48efbca3d514eddee packages/rke2-metrics-server/rke2-metrics-server.patch e2700807120484f988218317bbb199d6fddbb05520790d601b76f8f1ee98da4a packages/rke2-metrics-server/package.yaml +c58b6bd881ebf4e3a95742f5daefba8c11dcdb5bcbbde3f48efbca3d514eddee packages/rke2-metrics-server/rke2-metrics-server.patch