diff --git a/addons/prometheus-operator/v0.19.0.yaml b/addons/prometheus-operator/v0.19.0.yaml index d5afbc8745..f01e2f3dc2 100644 --- a/addons/prometheus-operator/v0.19.0.yaml +++ b/addons/prometheus-operator/v0.19.0.yaml @@ -5425,7 +5425,7 @@ spec: cpu: 100m memory: 50Mi nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux securityContext: runAsNonRoot: true runAsUser: 65534 @@ -5463,7 +5463,7 @@ metadata: spec: baseImage: quay.io/prometheus/alertmanager nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux replicas: 3 serviceAccountName: alertmanager-main version: v0.14.0 @@ -12693,7 +12693,7 @@ spec: cpu: 10m memory: 30Mi nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux securityContext: runAsNonRoot: true runAsUser: 65534 @@ -12873,7 +12873,7 @@ spec: cpu: 10m memory: 20Mi nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux securityContext: runAsNonRoot: true runAsUser: 65534 @@ -12982,7 +12982,7 @@ spec: port: web baseImage: quay.io/prometheus/prometheus nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux replicas: 2 resources: requests: diff --git a/addons/prometheus-operator/v0.26.0.yaml b/addons/prometheus-operator/v0.26.0.yaml index 675223d9ea..88042233fb 100644 --- a/addons/prometheus-operator/v0.26.0.yaml +++ b/addons/prometheus-operator/v0.26.0.yaml @@ -6482,7 +6482,7 @@ spec: allowPrivilegeEscalation: false readOnlyRootFilesystem: true nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux securityContext: runAsNonRoot: true runAsUser: 65534 @@ -6535,7 +6535,7 @@ metadata: spec: baseImage: quay.io/prometheus/alertmanager nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux replicas: 3 serviceAccountName: alertmanager-main version: v0.15.3 @@ -14274,7 +14274,7 @@ spec: cpu: 10m memory: 30Mi nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux securityContext: runAsNonRoot: true runAsUser: 65534 @@ -14475,7 +14475,7 @@ spec: hostNetwork: true hostPID: true nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux securityContext: runAsNonRoot: true runAsUser: 65534 @@ -14766,7 +14766,7 @@ spec: port: web baseImage: quay.io/prometheus/prometheus nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux replicas: 2 resources: requests: diff --git a/addons/prometheus-operator/v0.29.0.yaml b/addons/prometheus-operator/v0.29.0.yaml index 7a5cb39197..41b90a1927 100644 --- a/addons/prometheus-operator/v0.29.0.yaml +++ b/addons/prometheus-operator/v0.29.0.yaml @@ -6482,7 +6482,7 @@ spec: allowPrivilegeEscalation: false readOnlyRootFilesystem: true nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux securityContext: runAsNonRoot: true runAsUser: 65534 @@ -6535,7 +6535,7 @@ metadata: spec: baseImage: quay.io/prometheus/alertmanager nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux replicas: 3 serviceAccountName: alertmanager-main version: v0.15.3 @@ -14274,7 +14274,7 @@ spec: cpu: 10m memory: 30Mi nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux securityContext: runAsNonRoot: true runAsUser: 65534 @@ -14475,7 +14475,7 @@ spec: hostNetwork: true hostPID: true nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux securityContext: runAsNonRoot: true runAsUser: 65534 @@ -14766,7 +14766,7 @@ spec: port: web baseImage: quay.io/prometheus/prometheus nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux replicas: 2 resources: requests: diff --git a/addons/prometheus-operator/v0.42.1.yaml b/addons/prometheus-operator/v0.42.1.yaml index e418042afc..92d4301682 100644 --- a/addons/prometheus-operator/v0.42.1.yaml +++ b/addons/prometheus-operator/v0.42.1.yaml @@ -17182,7 +17182,7 @@ spec: securityContext: allowPrivilegeEscalation: false nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux securityContext: runAsNonRoot: true runAsUser: 65534 diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content index 03e1d017ea..22eb805f33 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content @@ -55,7 +55,7 @@ spec: version: 9.99.0 - id: v0.1.12 manifest: metadata-proxy.addons.k8s.io/v0.1.12.yaml - manifestHash: 86ec56ce7f5f4103793e3a03af7b213a8830dc958d4bf1fd65f0a032bf6d65b0 + manifestHash: 10cdb84ad4055ddadd11022796c90676417e60c1d34f6740d9e275051f2c5e7a name: metadata-proxy.addons.k8s.io selector: k8s-addon: metadata-proxy.addons.k8s.io diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content index 188a44d003..291c2f8bf0 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content @@ -108,8 +108,8 @@ spec: - mountPath: /host name: host nodeSelector: - beta.kubernetes.io/os: linux cloud.google.com/metadata-proxy-ready: "true" + kubernetes.io/os: linux priorityClassName: system-node-critical serviceAccountName: metadata-proxy terminationGracePeriodSeconds: 30 diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content index 45afc6ff60..0b6248db0c 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content @@ -62,7 +62,7 @@ spec: version: 9.99.0 - id: v0.1.12 manifest: metadata-proxy.addons.k8s.io/v0.1.12.yaml - manifestHash: 86ec56ce7f5f4103793e3a03af7b213a8830dc958d4bf1fd65f0a032bf6d65b0 + manifestHash: 10cdb84ad4055ddadd11022796c90676417e60c1d34f6740d9e275051f2c5e7a name: metadata-proxy.addons.k8s.io selector: k8s-addon: metadata-proxy.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content index 188a44d003..291c2f8bf0 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content @@ -108,8 +108,8 @@ spec: - mountPath: /host name: host nodeSelector: - beta.kubernetes.io/os: linux cloud.google.com/metadata-proxy-ready: "true" + kubernetes.io/os: linux priorityClassName: system-node-critical serviceAccountName: metadata-proxy terminationGracePeriodSeconds: 30 diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-bootstrap_content index ae5bb8b430..2c26c61975 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-bootstrap_content @@ -55,7 +55,7 @@ spec: version: 9.99.0 - id: v0.1.12 manifest: metadata-proxy.addons.k8s.io/v0.1.12.yaml - manifestHash: 86ec56ce7f5f4103793e3a03af7b213a8830dc958d4bf1fd65f0a032bf6d65b0 + manifestHash: 10cdb84ad4055ddadd11022796c90676417e60c1d34f6740d9e275051f2c5e7a name: metadata-proxy.addons.k8s.io selector: k8s-addon: metadata-proxy.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content index 188a44d003..291c2f8bf0 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content @@ -108,8 +108,8 @@ spec: - mountPath: /host name: host nodeSelector: - beta.kubernetes.io/os: linux cloud.google.com/metadata-proxy-ready: "true" + kubernetes.io/os: linux priorityClassName: system-node-critical serviceAccountName: metadata-proxy terminationGracePeriodSeconds: 30 diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content index 0f721b3008..e77af2794c 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content @@ -62,7 +62,7 @@ spec: version: 9.99.0 - id: v0.1.12 manifest: metadata-proxy.addons.k8s.io/v0.1.12.yaml - manifestHash: 86ec56ce7f5f4103793e3a03af7b213a8830dc958d4bf1fd65f0a032bf6d65b0 + manifestHash: 10cdb84ad4055ddadd11022796c90676417e60c1d34f6740d9e275051f2c5e7a name: metadata-proxy.addons.k8s.io selector: k8s-addon: metadata-proxy.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content index 188a44d003..291c2f8bf0 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content @@ -108,8 +108,8 @@ spec: - mountPath: /host name: host nodeSelector: - beta.kubernetes.io/os: linux cloud.google.com/metadata-proxy-ready: "true" + kubernetes.io/os: linux priorityClassName: system-node-critical serviceAccountName: metadata-proxy terminationGracePeriodSeconds: 30 diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content index 0f721b3008..e77af2794c 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content @@ -62,7 +62,7 @@ spec: version: 9.99.0 - id: v0.1.12 manifest: metadata-proxy.addons.k8s.io/v0.1.12.yaml - manifestHash: 86ec56ce7f5f4103793e3a03af7b213a8830dc958d4bf1fd65f0a032bf6d65b0 + manifestHash: 10cdb84ad4055ddadd11022796c90676417e60c1d34f6740d9e275051f2c5e7a name: metadata-proxy.addons.k8s.io selector: k8s-addon: metadata-proxy.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content index 188a44d003..291c2f8bf0 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content @@ -108,8 +108,8 @@ spec: - mountPath: /host name: host nodeSelector: - beta.kubernetes.io/os: linux cloud.google.com/metadata-proxy-ready: "true" + kubernetes.io/os: linux priorityClassName: system-node-critical serviceAccountName: metadata-proxy terminationGracePeriodSeconds: 30 diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-bootstrap_content index 3fd267f2f7..fb47e90d01 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-bootstrap_content @@ -55,7 +55,7 @@ spec: version: 9.99.0 - id: v0.1.12 manifest: metadata-proxy.addons.k8s.io/v0.1.12.yaml - manifestHash: 86ec56ce7f5f4103793e3a03af7b213a8830dc958d4bf1fd65f0a032bf6d65b0 + manifestHash: 10cdb84ad4055ddadd11022796c90676417e60c1d34f6740d9e275051f2c5e7a name: metadata-proxy.addons.k8s.io selector: k8s-addon: metadata-proxy.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content index 188a44d003..291c2f8bf0 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-metadata-proxy.addons.k8s.io-v0.1.12_content @@ -108,8 +108,8 @@ spec: - mountPath: /host name: host nodeSelector: - beta.kubernetes.io/os: linux cloud.google.com/metadata-proxy-ready: "true" + kubernetes.io/os: linux priorityClassName: system-node-critical serviceAccountName: metadata-proxy terminationGracePeriodSeconds: 30 diff --git a/upup/models/cloudup/resources/addons/metadata-proxy.addons.k8s.io/v0.1.12.yaml b/upup/models/cloudup/resources/addons/metadata-proxy.addons.k8s.io/v0.1.12.yaml index 14ff106475..b73025fd6a 100644 --- a/upup/models/cloudup/resources/addons/metadata-proxy.addons.k8s.io/v0.1.12.yaml +++ b/upup/models/cloudup/resources/addons/metadata-proxy.addons.k8s.io/v0.1.12.yaml @@ -119,5 +119,5 @@ spec: # END_PROMETHEUS_TO_SD nodeSelector: cloud.google.com/metadata-proxy-ready: "true" - beta.kubernetes.io/os: linux + kubernetes.io/os: linux terminationGracePeriodSeconds: 30