mirror of https://github.com/kubernetes/kops.git
Merge pull request #14459 from pacoxu/master
Stop applying the beta.kubernetes.io/os
This commit is contained in:
commit
0aebcbc6d9
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -17182,7 +17182,7 @@ spec:
|
|||
securityContext:
|
||||
allowPrivilegeEscalation: false
|
||||
nodeSelector:
|
||||
beta.kubernetes.io/os: linux
|
||||
kubernetes.io/os: linux
|
||||
securityContext:
|
||||
runAsNonRoot: true
|
||||
runAsUser: 65534
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue