From e9958cf07082956626993ba1087c89a68fc9dc99 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Tue, 16 May 2023 20:13:50 +0000 Subject: [PATCH] Bump metrics-server to v0.6.3 and update tls-cipher-suites Signed-off-by: Brad Davidson --- manifests/metrics-server/metrics-server-deployment.yaml | 3 ++- pkg/deploy/zz_generated_bindata.go | 2 +- scripts/airgap/image-list.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/manifests/metrics-server/metrics-server-deployment.yaml b/manifests/metrics-server/metrics-server-deployment.yaml index 43dcf8bfab..24fafa4f96 100644 --- a/manifests/metrics-server/metrics-server-deployment.yaml +++ b/manifests/metrics-server/metrics-server-deployment.yaml @@ -44,13 +44,14 @@ spec: emptyDir: {} containers: - name: metrics-server - image: %{SYSTEM_DEFAULT_REGISTRY}%rancher/mirrored-metrics-server:v0.6.2 + image: %{SYSTEM_DEFAULT_REGISTRY}%rancher/mirrored-metrics-server:v0.6.3 args: - --cert-dir=/tmp - --secure-port=10250 - --kubelet-preferred-address-types=%{PREFERRED_ADDRESS_TYPES}% - --kubelet-use-node-status-port - --metric-resolution=15s + - --tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305 resources: requests: cpu: 100m diff --git a/pkg/deploy/zz_generated_bindata.go b/pkg/deploy/zz_generated_bindata.go index 057eb39217..74d52de6b9 100644 --- a/pkg/deploy/zz_generated_bindata.go +++ b/pkg/deploy/zz_generated_bindata.go @@ -231,7 +231,7 @@ func metricsServerMetricsApiserviceYaml() (*asset, error) { return a, nil } -var _metricsServerMetricsServerDeploymentYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x55\xdf\x4f\x1b\x47\x10\x7e\xf7\x5f\x31\x72\xc5\xe3\x61\x9b\x2a\x69\xb5\x12\x0f\x08\x9b\xa4\x12\x50\xcb\x67\x2a\xf1\x84\x96\xbd\x31\x5e\xb1\xbf\x3a\x33\xe7\x70\x45\xfc\xef\xd5\xfa\xc8\xe5\x8e\x40\x94\xaa\xc9\x3d\xce\x37\xf3\xcd\xb7\xdf\xee\xcc\x15\x45\x31\xd2\xc9\xfe\x85\xc4\x36\x06\x05\xbb\xd9\xe8\xde\x86\x4a\x41\x89\xb4\xb3\x06\x4f\x8c\x89\x75\x90\x91\x47\xd1\x95\x16\xad\x46\x00\x41\x7b\x54\xe0\x51\xc8\x1a\x2e\x18\x69\x87\xf4\x1c\xe6\xa4\x0d\x2a\xb8\xaf\x6f\xb1\xe0\x86\x05\xfd\xe8\x65\x07\x9d\x12\x4f\xba\x36\x73\x4c\x2e\x36\x1e\xff\x57\x0b\x00\xa7\x6f\xd1\x71\xae\x04\xb8\xff\x9d\x0b\x9d\xd2\x57\xe5\x9c\xd0\xe4\x0c\xc2\x9d\xcd\x52\x3e\x5a\x96\x48\xcd\xb9\xf5\x56\x14\x4c\x47\x00\x2c\xa4\x05\xef\x9a\x96\x47\x9a\x84\x0a\x56\xd1\x39\x1b\xee\xae\x52\xa5\x05\xf7\x71\xea\x47\xda\x54\x00\xaf\x1f\xae\x82\xde\x69\xeb\xf4\xad\x43\x05\xb3\x4c\x87\x0e\x8d\x44\x6a\x73\xbc\x16\xb3\x3d\xef\xe9\x7c\x5b\x29\x80\xa0\x4f\xae\xa3\xef\x3b\x93\xbf\x37\xdc\xc9\x9f\x1b\x34\xf8\x56\x0b\x80\xcf\x86\xe4\x2f\x91\x8d\x64\xa5\x39\x75\x9a\xf9\x72\xcf\x3f\x6e\xdd\x2d\x42\xac\xb0\x30\x64\xc5\x1a\xed\xc6\xcf\xf9\x3c\x78\x1e\x97\x6f\x0b\x92\xe8\x90\xb4\xd8\x18\x7a\xaa\x0a\xb8\xc7\x46\xc1\xf8\xf4\x99\xf5\xa4\xaa\x62\xe0\x3f\x83\x6b\xc6\x5d\x0e\x40\x4c\xb9\x32\x92\x82\xf1\xe2\xc1\xb2\xf0\xf8\x2b\x82\xbd\x36\x8a\x0e\x0f\xf3\x7b\xa0\x80\x82\x7c\x68\xe3\xc4\xc4\x20\x14\x5d\x91\x9c\x0e\xf8\x9d\x9c\x00\xb8\xd9\xa0\x11\x05\xe3\xcb\x58\x9a\x2d\x56\xb5\xc3\xef\x6f\xe9\x35\x0b\xd2\x8f\xe8\xb5\x8b\xae\xf6\xd8\xd9\xf5\x0b\xf8\xec\x31\xd8\x00\xe2\x13\x70\x84\x4f\x08\x46\x07\x60\xbd\x41\xd7\x40\xcd\x08\x1b\x8a\xbe\x60\x43\xf9\x8d\x81\xf5\xfa\x0e\x19\x74\xa8\x26\x91\x80\x50\x57\x45\x0c\xae\x81\x6c\x8a\xb6\x01\x89\x47\x9f\x8f\xd4\xbe\x24\xf1\xa9\xa8\x2c\x75\xea\xd0\x27\x69\xe6\x96\x14\x3c\x3e\x3d\x07\xbf\xd4\xaa\x17\xc5\xaf\xde\x3a\xb4\x22\x14\x1c\x3c\x96\xd7\xe5\x7a\x71\x71\x33\x5f\x9c\x9d\x5c\x9d\xaf\x6f\x56\x8b\x0f\x7f\x94\xeb\xd5\xf5\xd3\x01\xe9\x60\xb6\x48\x13\x6f\x89\x22\x61\x55\x0c\x99\xd4\x6e\x7a\xf8\xfe\xf0\xa8\x23\xd4\x74\x37\x78\x41\x45\x61\x90\x24\xeb\x3e\x9e\x88\x4f\x03\x84\xd1\xd4\x84\x45\x8a\x24\xc7\xb3\xe9\xd1\xbb\xe9\x00\xcd\xf7\xe6\x50\x8a\x44\xb8\x41\xca\x9d\x75\x55\x11\x32\x17\x79\xe4\xf9\xf8\xe0\x71\xb9\x5a\x9c\x2d\x56\xab\xc5\xfc\xe6\x64\x3e\x5f\x2d\xca\xf2\x66\x7d\xbd\x5c\x94\x4f\x07\xaf\xf2\xd4\x8c\xed\x90\xb0\x68\xa9\x79\xdf\x76\x90\xd8\x1e\xac\x20\xe4\xe8\xea\x3c\x0a\xc7\xb3\x77\xdc\x65\xe4\x70\x4d\x06\x7b\xa7\xcb\xc1\xbf\x6b\x64\x19\xc4\x00\x4c\xaa\x15\xcc\xa6\x53\x3f\x88\x7a\xf4\x91\x1a\x05\xbf\x4d\x2f\x6c\x07\x64\x11\x03\xbf\xda\xdb\xda\x8a\x24\xee\x55\x77\xf7\xba\x8c\x24\x99\xbb\x6f\x56\x5e\x0b\x51\xa2\x89\x4e\xc1\xfa\x74\xd9\x53\xac\x2b\x1b\x90\x79\x49\xf1\x16\xfb\x12\x33\xfd\x07\x94\xa1\xea\xa4\x65\xab\x60\x92\xab\x9a\x7f\x86\xc8\xbe\xe9\x4b\x4d\x00\x6c\xb6\x98\xd5\x7e\x5c\xaf\x97\x65\x0f\xb1\xc1\x8a\xd5\x6e\x8e\x4e\x37\x25\x9a\x18\x2a\x6e\x37\x77\x47\x88\x64\x63\xd5\x41\x47\x3d\x48\xac\xc7\x58\x4b\x87\xcd\x7a\x18\xd7\xc6\x20\xf3\x7a\x4b\xc8\xdb\xe8\xaa\x21\xba\xd1\xd6\xd5\x84\x3d\xf4\xd7\x0e\x75\x76\x87\xff\xd9\x89\x5c\xf4\x13\x8c\x78\xff\x0d\x27\x66\xd3\x9f\x6e\xc5\x7e\xe8\xf2\x2f\x24\x06\xc1\x07\x19\xbe\x66\x5d\xe5\xed\xbe\x8a\x51\xce\xac\xc3\xf6\xcf\xa2\x40\xa8\xc6\x7e\x5a\x1d\x4e\xf8\x32\x86\x9c\xf6\x3a\x78\xc5\x48\xfb\x09\xe8\x1f\x47\x3b\x17\x3f\x2d\xc9\xee\xac\xc3\x3b\x5c\xb0\xd1\x6e\xff\xc3\x51\xb0\xd1\x8e\xbf\x70\xb4\x7b\xf5\x22\x2f\xd3\x57\x26\xe3\xe5\x12\x84\x76\xed\x2e\xdb\x2b\xcb\x1b\xe6\xdf\x00\x00\x00\xff\xff\x14\xc8\x49\x02\x2c\x09\x00\x00") +var _metricsServerMetricsServerDeploymentYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x55\xc1\x6e\xdb\x46\x10\xbd\xeb\x2b\x06\x2a\x7c\x2b\x6d\x49\xa9\xdd\x80\x80\x0f\x82\xc4\x44\x01\x6c\x47\x10\xe5\x16\x3e\x09\xeb\xe5\xc8\x5a\x78\xb9\xbb\x9d\x19\x2a\x61\x83\xfc\x7b\xb1\xa2\x43\x93\x8e\x1d\xb8\x68\xc3\x03\x0f\x33\x6f\xde\x3c\xbe\x9d\xe5\x24\x49\x32\x50\xc1\xfc\x81\xc4\xc6\xbb\x14\xf6\xe3\xc1\xbd\x71\x45\x0a\x39\xd2\xde\x68\x9c\x6a\xed\x2b\x27\x83\x12\x45\x15\x4a\x54\x3a\x00\x70\xaa\xc4\x14\x4a\x14\x32\x9a\x13\x46\xda\x23\x3d\x84\x39\x28\x8d\x29\xdc\x57\xb7\x98\x70\xcd\x82\xe5\xe0\x69\x07\x15\x02\x9f\xb4\x6d\xe6\x18\xac\xaf\x4b\xfc\x4f\x2d\x00\xac\xba\x45\xcb\xb1\x12\xe0\xfe\x2d\x27\x2a\x84\xef\xca\x39\xa0\x8e\x08\xc2\xbd\x89\x52\x16\x86\xc5\x53\x7d\x61\x4a\x23\x29\x8c\x06\x00\x2c\xa4\x04\xef\xea\x86\x47\xea\x80\x29\xac\xbc\xb5\xc6\xdd\x5d\x87\x42\x09\x1e\xe2\xd4\x8d\x34\x50\x80\x52\x7d\xbe\x76\x6a\xaf\x8c\x55\xb7\x16\x53\x18\x47\x3a\xb4\xa8\xc5\x53\x83\x29\x95\xe8\xdd\x45\x47\xe7\xcb\x4a\x01\x04\xcb\x60\x5b\xfa\xae\x33\xf1\x79\xc1\x9d\xf8\xd8\x5e\x83\x1f\xb5\x00\xf8\x66\x48\x7c\x02\x19\x4f\x46\xea\x99\x55\xcc\x57\x07\xfe\x61\xe3\x6e\xe2\x7c\x81\x89\x26\x23\x46\x2b\x3b\x7c\xc0\x73\x6f\x3c\xae\x5e\x16\x24\xde\x22\x29\x31\xde\x75\x54\x25\x70\x8f\x75\x0a\xc3\xd9\x03\xeb\xb4\x28\xbc\xe3\x8f\xce\xd6\xc3\x16\x03\xe0\x43\xac\xf4\x94\xc2\x30\xfb\x6c\x58\x78\xf8\x1d\xc1\x41\x1b\x79\x8b\xc7\x71\x1e\xc8\xa1\x20\x1f\x1b\x7f\xa2\xbd\x13\xf2\x36\x09\x56\x39\x7c\x25\x27\x00\x6e\xb7\xa8\x25\x85\xe1\x95\xcf\xf5\x0e\x8b\xca\xe2\xeb\x5b\x96\x8a\x05\xe9\xff\xe8\xb5\xf7\xb6\x2a\xb1\xb5\xeb\x17\x28\xa3\xc7\x60\x1c\x48\x19\x80\x3d\x7c\x42\xd0\xca\x01\xab\x2d\xda\x1a\x2a\x46\xd8\x92\x2f\x13\xd6\x14\x67\x0c\x4c\xa9\xee\x90\x41\xb9\xe2\xc4\x13\x10\xaa\x22\xf1\xce\xd6\x10\x4d\x51\xc6\x21\xf1\xe0\xdb\x27\x35\x93\x24\x65\x48\x0a\x43\xad\x3a\x2c\x83\xd4\x73\x43\x29\x7c\xf9\xfa\x10\x7c\xac\x4d\x9f\x14\x3f\x7b\xea\xd0\x88\x48\xe1\xe8\x4b\x7e\x93\xaf\xb3\xcb\xcd\x3c\x7b\x37\xbd\xbe\x58\x6f\x56\xd9\xfb\x0f\xf9\x7a\x75\xf3\xf5\x88\x94\xd3\x3b\xa4\x93\xd2\x10\x79\xc2\x22\xe9\x33\xa5\xfb\xd1\xf1\xd9\xf1\x9b\x96\x50\xd1\x5d\x6f\x82\x92\x44\x23\x49\xd4\x7d\x7e\x22\x65\xe8\x65\x18\x75\x45\x98\x04\x4f\x72\x3e\x1e\x4d\x4e\x47\xbd\x6c\x3c\x37\x8b\x92\x04\xc2\x2d\x52\xec\xac\x8a\x82\x90\x39\x89\x57\x9e\xcf\x8f\xbe\x2c\x57\xd9\xbb\x6c\xb5\xca\xe6\x9b\xe9\x7c\xbe\xca\xf2\x7c\xb3\xbe\x59\x66\xf9\xd7\xa3\x67\x79\x2a\xc6\xe6\x92\xb0\x28\xa9\xf8\xd0\xb6\x07\x6c\x3e\x2c\x21\x64\x6f\xab\x78\x15\xce\xc7\xa7\xdc\x43\x88\xe5\x44\x9b\xb0\x43\x4a\xb8\x32\x82\x7c\xbe\xbe\xc8\x37\xd9\x6c\xbe\xc8\xe2\x3b\x9f\x6e\xfe\xfc\xb0\x5e\x6c\xa6\x59\xbe\x99\x9c\x9e\x6d\xde\xcf\x2e\x37\xf9\x62\xfa\xe6\xed\x6f\xbf\x3e\xe2\x56\xaf\x42\x3d\x61\x1b\x4f\xde\x7e\xc3\x4d\x4e\xcf\x5e\x62\x7b\x11\xd5\x61\x9b\x2d\xa6\xb3\xc5\x74\x32\xda\x2c\x3f\x5e\xdc\x8c\xdf\x8c\x4e\x9f\x23\xfb\x0e\xd4\xba\x10\xcd\xa9\x48\x63\xe7\x8c\x63\xf0\xaf\x0a\x59\x7a\x31\x00\x1d\xaa\x14\xc6\xa3\x51\xd9\x8b\x96\x58\x7a\xaa\x53\xf8\x7d\x74\x69\xda\x44\x3c\x8a\xde\xd4\x34\x33\xbb\x13\x09\xdc\xa9\x6e\xa7\x7b\xe9\x49\x22\x77\x77\x64\xe2\xcf\xd1\x8b\xd7\xde\xa6\xb0\x9e\x2d\x3b\x8a\x55\x61\x1c\x32\x2f\xc9\xdf\x62\x57\x62\xa4\x7f\x8f\xd2\x57\x1d\x94\xec\x52\x38\x89\x55\xf5\xdf\xfd\xcc\xa1\xe9\x53\x4d\x00\xac\x77\x18\xd5\x2e\xd6\xeb\x65\xde\xc9\x18\x67\xc4\x28\x3b\x47\xab\xea\x1c\xb5\x77\x05\x37\xfb\xab\x25\x44\x32\xbe\x68\x53\x93\x4e\x4a\x4c\x89\xbe\x92\x36\x37\xee\xe4\xb8\xd2\x1a\x99\xd7\x3b\x42\xde\x79\x5b\xf4\xb3\x5b\x65\x6c\x45\xd8\xc9\x3e\xde\x4d\x6b\xf6\xf8\xaf\x9d\x88\x45\x3f\xc1\x88\xb3\x1f\x38\x31\x1e\xfd\x74\x2b\x0e\xbf\x9e\xb8\x48\xbd\x13\xfc\x2c\xfd\x69\x56\x45\xdc\x71\x2b\xef\xe5\x9d\xb1\xd8\xec\xd7\x14\x84\x2a\xec\xc2\x2a\x37\xe5\x2b\xef\x22\xec\xf9\xe4\x35\x23\x1d\x6e\x40\xf7\x73\x94\xb5\xfe\xd3\x92\xcc\xde\x58\xbc\xc3\x8c\xb5\xb2\x87\xb5\x9b\xc2\x56\x59\x7e\xe4\x68\xb6\xcb\x65\x5c\x29\xcf\xdc\x8c\xa7\xab\x00\x9a\xe5\xb3\x6c\x8e\x2c\xfe\x67\xff\x09\x00\x00\xff\xff\x70\xb0\x51\x48\x32\x0a\x00\x00") func metricsServerMetricsServerDeploymentYamlBytes() ([]byte, error) { return bindataRead( diff --git a/scripts/airgap/image-list.txt b/scripts/airgap/image-list.txt index 0fb3b895a3..93536794af 100644 --- a/scripts/airgap/image-list.txt +++ b/scripts/airgap/image-list.txt @@ -4,5 +4,5 @@ docker.io/rancher/local-path-provisioner:v0.0.24 docker.io/rancher/mirrored-coredns-coredns:1.10.1 docker.io/rancher/mirrored-library-busybox:1.34.1 docker.io/rancher/mirrored-library-traefik:2.9.10 -docker.io/rancher/mirrored-metrics-server:v0.6.2 +docker.io/rancher/mirrored-metrics-server:v0.6.3 docker.io/rancher/mirrored-pause:3.6