kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Address review comments

This commit is contained in:
John Gardiner Myers 2022-12-04 10:58:05 -08:00
parent 91e636aff2
commit dfd71c0c41
17 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -62,7 +62,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: 530f8614aa57d59515d42415efc3800f96199b73c4376845c85cb4dc0319bb7d
manifestHash: cf22350355099c28c5542edbfb5d461c9db78f254f5e4bcff3292f5a6b385720
name: node-termination-handler.aws
prune:
kinds:

3
tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -117,7 +117,6 @@ metadata:
spec:
selector:
matchLabels:
app.kubernetes.io/component: daemonset
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/name: aws-node-termination-handler
kubernetes.io/os: linux
@ -166,7 +165,7 @@ spec:
- name: JSON_LOGGING
value: "true"
- name: LOG_FORMAT_VERSION
value: "1"
value: "2"
- name: ENABLE_PROMETHEUS_SERVER
value: "false"
- name: PROMETHEUS_SERVER_PORT

2
tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -69,7 +69,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: 530f8614aa57d59515d42415efc3800f96199b73c4376845c85cb4dc0319bb7d
manifestHash: cf22350355099c28c5542edbfb5d461c9db78f254f5e4bcff3292f5a6b385720
name: node-termination-handler.aws
prune:
kinds:

3
tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -117,7 +117,6 @@ metadata:
spec:
selector:
matchLabels:
app.kubernetes.io/component: daemonset
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/name: aws-node-termination-handler
kubernetes.io/os: linux
@ -166,7 +165,7 @@ spec:
- name: JSON_LOGGING
value: "true"
- name: LOG_FORMAT_VERSION
value: "1"
value: "2"
- name: ENABLE_PROMETHEUS_SERVER
value: "false"
- name: PROMETHEUS_SERVER_PORT

2
tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -69,7 +69,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: 530f8614aa57d59515d42415efc3800f96199b73c4376845c85cb4dc0319bb7d
manifestHash: cf22350355099c28c5542edbfb5d461c9db78f254f5e4bcff3292f5a6b385720
name: node-termination-handler.aws
prune:
kinds:

3
tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -117,7 +117,6 @@ metadata:
spec:
selector:
matchLabels:
app.kubernetes.io/component: daemonset
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/name: aws-node-termination-handler
kubernetes.io/os: linux
@ -166,7 +165,7 @@ spec:
- name: JSON_LOGGING
value: "true"
- name: LOG_FORMAT_VERSION
value: "1"
value: "2"
- name: ENABLE_PROMETHEUS_SERVER
value: "false"
- name: PROMETHEUS_SERVER_PORT

2
tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -69,7 +69,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: 530f8614aa57d59515d42415efc3800f96199b73c4376845c85cb4dc0319bb7d
manifestHash: cf22350355099c28c5542edbfb5d461c9db78f254f5e4bcff3292f5a6b385720
name: node-termination-handler.aws
prune:
kinds:

3
tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -117,7 +117,6 @@ metadata:
spec:
selector:
matchLabels:
app.kubernetes.io/component: daemonset
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/name: aws-node-termination-handler
kubernetes.io/os: linux
@ -166,7 +165,7 @@ spec:
- name: JSON_LOGGING
value: "true"
- name: LOG_FORMAT_VERSION
value: "1"
value: "2"
- name: ENABLE_PROMETHEUS_SERVER
value: "false"
- name: PROMETHEUS_SERVER_PORT

2
tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -62,7 +62,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: 530f8614aa57d59515d42415efc3800f96199b73c4376845c85cb4dc0319bb7d
manifestHash: cf22350355099c28c5542edbfb5d461c9db78f254f5e4bcff3292f5a6b385720
name: node-termination-handler.aws
prune:
kinds:

3
tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -117,7 +117,6 @@ metadata:
spec:
selector:
matchLabels:
app.kubernetes.io/component: daemonset
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/name: aws-node-termination-handler
kubernetes.io/os: linux
@ -166,7 +165,7 @@ spec:
- name: JSON_LOGGING
value: "true"
- name: LOG_FORMAT_VERSION
value: "1"
value: "2"
- name: ENABLE_PROMETHEUS_SERVER
value: "false"
- name: PROMETHEUS_SERVER_PORT

2
tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -62,7 +62,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: 50b6162b12dd1a95455e20a8ce6848782d0ecea154a38cff07cd5cab126c89e4
manifestHash: a6ccfd21bb3ab6ffbc5d48580197c2ecbbcf3ad68043b4c068eb4cc40405fd2c
name: node-termination-handler.aws
prune:
kinds:

3
tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -117,7 +117,6 @@ metadata:
spec:
selector:
matchLabels:
app.kubernetes.io/component: daemonset
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/name: aws-node-termination-handler
kubernetes.io/os: linux
@ -166,7 +165,7 @@ spec:
- name: JSON_LOGGING
value: "true"
- name: LOG_FORMAT_VERSION
value: "1"
value: "2"
- name: ENABLE_PROMETHEUS_SERVER
value: "false"
- name: PROMETHEUS_SERVER_PORT

2
tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -62,7 +62,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: 50b6162b12dd1a95455e20a8ce6848782d0ecea154a38cff07cd5cab126c89e4
manifestHash: a6ccfd21bb3ab6ffbc5d48580197c2ecbbcf3ad68043b4c068eb4cc40405fd2c
name: node-termination-handler.aws
prune:
kinds:

3
tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -117,7 +117,6 @@ metadata:
spec:
selector:
matchLabels:
app.kubernetes.io/component: daemonset
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/name: aws-node-termination-handler
kubernetes.io/os: linux
@ -166,7 +165,7 @@ spec:
- name: JSON_LOGGING
value: "true"
- name: LOG_FORMAT_VERSION
value: "1"
value: "2"
- name: ENABLE_PROMETHEUS_SERVER
value: "false"
- name: PROMETHEUS_SERVER_PORT

2
tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_nthsqsresources.longclustername.example.com-addons-bootstrap_content
View File

@ -41,7 +41,7 @@ spec:
version: 9.99.0
- id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: 850b01c8e6a3247a2e4e39e3f08eadd0c937819f9efcae74e399155a8a1f48a3
manifestHash: ed2bdba1e75bedd13ea4368b86511f4e4d83dd16e456fd66e62b55696eda8253
name: node-termination-handler.aws
prune:
kinds:

2
tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_nthsqsresources.longclustername.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -168,7 +168,7 @@ spec:
- name: JSON_LOGGING
value: "true"
- name: LOG_FORMAT_VERSION
value: "1"
value: "2"
- name: ENABLE_PROMETHEUS_SERVER
value: "false"
- name: PROMETHEUS_SERVER_PORT

5
upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template
View File

@ -175,7 +175,7 @@ spec:
- name: JSON_LOGGING
value: "true"
- name: LOG_FORMAT_VERSION
value: "1"
value: "2"
- name: ENABLE_PROMETHEUS_SERVER
value: "{{ WithDefaultBool .EnablePrometheusMetrics false }}"
- name: PROMETHEUS_SERVER_PORT
@ -298,7 +298,6 @@ spec:
matchLabels:
app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/component: daemonset
kubernetes.io/os: linux
template:
metadata:
@ -349,7 +348,7 @@ spec:
- name: JSON_LOGGING
value: "true"
- name: LOG_FORMAT_VERSION
value: "1"
value: "2"
- name: ENABLE_PROMETHEUS_SERVER
value: "{{ WithDefaultBool .EnablePrometheusMetrics false }}"
- name: PROMETHEUS_SERVER_PORT