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

Make json logging on deployment and enable k8s events

This commit is contained in:
Ole Markus With 2021-08-31 22:16:59 +02:00
parent b52008d9b6
commit e2fd94d104
9 changed files with 18 additions and 6 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_bucket_object_minimal.example.com-addons-bootstrap_content
View File

@ -52,7 +52,7 @@ spec:
selector: null selector: null
- id: k8s-1.11 - id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: 921107cec6ff139ad757c3167c9d479ef87804e39efdf172d23b7b0b3c453a14 manifestHash: 4197a26e91677e28e68617b12e8b2e9f2825d397578dcd7d8b6500e47a05c4c2
name: node-termination-handler.aws name: node-termination-handler.aws
selector: selector:
k8s-addon: node-termination-handler.aws k8s-addon: node-termination-handler.aws

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

@ -162,6 +162,8 @@ spec:
value: "false" value: "false"
- name: LOG_LEVEL - name: LOG_LEVEL
value: info value: info
- name: EMIT_KUBERNETES_EVENTS
value: "true"
- name: AWS_ROLE_ARN - name: AWS_ROLE_ARN
value: arn:aws-test:iam::123456789012:role/aws-node-termination-handler.kube-system.sa.minimal.example.com value: arn:aws-test:iam::123456789012:role/aws-node-termination-handler.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE - name: AWS_WEB_IDENTITY_TOKEN_FILE

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

@ -52,7 +52,7 @@ spec:
selector: null selector: null
- id: k8s-1.11 - id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: aff5c358e9068af057fc266041105328dd9e11e473cd051f393f67182edc47fb manifestHash: dd42ae2f7510700d37bf0214e0afdd87c12968c5c67ec88791f20f06fef90caf
name: node-termination-handler.aws name: node-termination-handler.aws
selector: selector:
k8s-addon: node-termination-handler.aws k8s-addon: node-termination-handler.aws

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

@ -162,6 +162,8 @@ spec:
value: "false" value: "false"
- name: LOG_LEVEL - name: LOG_LEVEL
value: info value: info
- name: EMIT_KUBERNETES_EVENTS
value: "true"
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.3 image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.3
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: aws-node-termination-handler name: aws-node-termination-handler

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

@ -52,7 +52,7 @@ spec:
selector: null selector: null
- id: k8s-1.11 - id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: aff5c358e9068af057fc266041105328dd9e11e473cd051f393f67182edc47fb manifestHash: dd42ae2f7510700d37bf0214e0afdd87c12968c5c67ec88791f20f06fef90caf
name: node-termination-handler.aws name: node-termination-handler.aws
selector: selector:
k8s-addon: node-termination-handler.aws k8s-addon: node-termination-handler.aws

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

@ -162,6 +162,8 @@ spec:
value: "false" value: "false"
- name: LOG_LEVEL - name: LOG_LEVEL
value: info value: info
- name: EMIT_KUBERNETES_EVENTS
value: "true"
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.3 image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.3
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: aws-node-termination-handler name: aws-node-termination-handler

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

@ -41,7 +41,7 @@ spec:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
- id: k8s-1.11 - id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: 0d47866cd451a44675257bc40b4902d3dce29ebe88ab3f9f43f31e246e6ce7f1 manifestHash: c03c13e87cb8c6a7731fdbc08c9f99e1c960a9da71696fd33b781eca51de22dc
name: node-termination-handler.aws name: node-termination-handler.aws
selector: selector:
k8s-addon: node-termination-handler.aws k8s-addon: node-termination-handler.aws

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

@ -168,7 +168,7 @@ spec:
- name: TAINT_NODE - name: TAINT_NODE
value: "false" value: "false"
- name: JSON_LOGGING - name: JSON_LOGGING
value: "false" value: "true"
- name: LOG_LEVEL - name: LOG_LEVEL
value: info value: info
- name: WEBHOOK_PROXY - name: WEBHOOK_PROXY
@ -199,6 +199,8 @@ spec:
value: aws-node-termination-handler/managed value: aws-node-termination-handler/managed
- name: WORKERS - name: WORKERS
value: "10" value: "10"
- name: EMIT_KUBERNETES_EVENTS
value: "true"
image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.3 image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.13.3
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: aws-node-termination-handler name: aws-node-termination-handler

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

@ -167,7 +167,7 @@ spec:
- name: TAINT_NODE - name: TAINT_NODE
value: "false" value: "false"
- name: JSON_LOGGING - name: JSON_LOGGING
value: "false" value: "true"
- name: LOG_LEVEL - name: LOG_LEVEL
value: "info" value: "info"
- name: WEBHOOK_PROXY - name: WEBHOOK_PROXY
@ -198,6 +198,8 @@ spec:
value: "{{ .ManagedASGTag }}" value: "{{ .ManagedASGTag }}"
- name: WORKERS - name: WORKERS
value: "10" value: "10"
- name: EMIT_KUBERNETES_EVENTS
value: "true"
resources: resources:
requests: requests:
cpu: {{ .CPURequest }} cpu: {{ .CPURequest }}
@ -313,6 +315,8 @@ spec:
value: "{{ .EnablePrometheusMetrics }}" value: "{{ .EnablePrometheusMetrics }}"
- name: LOG_LEVEL - name: LOG_LEVEL
value: "info" value: "info"
- name: EMIT_KUBERNETES_EVENTS
value: "true"
resources: resources:
requests: requests:
cpu: {{ .CPURequest }} cpu: {{ .CPURequest }}