From 2d56558efe3d802c73bd4e2591e03c77d4fb368e Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Tue, 6 Jul 2021 12:50:50 +0200 Subject: [PATCH] Run cert-manager cainjector on CP nodes as well --- ...ucket_object_minimal.example.com-addons-bootstrap_content | 2 +- ...inimal.example.com-addons-certmanager.io-k8s-1.16_content | 5 +++++ ...ucket_object_minimal.example.com-addons-bootstrap_content | 2 +- ...inimal.example.com-addons-certmanager.io-k8s-1.16_content | 5 +++++ .../resources/addons/certmanager.io/k8s-1.16.yaml.template | 5 +++++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index c2bb43db80341..7aad06a709cab 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: k8s-addon: dns-controller.addons.k8s.io - id: k8s-1.16 manifest: certmanager.io/k8s-1.16.yaml - manifestHash: 487c047d774b1368a74463202aaf5790c186ae6f + manifestHash: 59b5f2a0fd6f5fb558c6bb85a38f0236f4ef840f name: certmanager.io selector: null - id: k8s-1.9 diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content index 60b0f695a5d9e..a661861d7533e 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content @@ -26862,8 +26862,13 @@ spec: imagePullPolicy: IfNotPresent name: cert-manager resources: {} + nodeSelector: + node-role.kubernetes.io/master: "" priorityClassName: system-cluster-critical serviceAccountName: cert-manager-cainjector + tolerations: + - key: node-role.kubernetes.io/master + operator: Exists --- diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index f70682cd9a90a..4d64d2cbb8d38 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -47,7 +47,7 @@ spec: k8s-addon: cluster-autoscaler.addons.k8s.io - id: k8s-1.16 manifest: certmanager.io/k8s-1.16.yaml - manifestHash: 487c047d774b1368a74463202aaf5790c186ae6f + manifestHash: 59b5f2a0fd6f5fb558c6bb85a38f0236f4ef840f name: certmanager.io selector: null - id: k8s-1.11 diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content index 60b0f695a5d9e..a661861d7533e 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content @@ -26862,8 +26862,13 @@ spec: imagePullPolicy: IfNotPresent name: cert-manager resources: {} + nodeSelector: + node-role.kubernetes.io/master: "" priorityClassName: system-cluster-critical serviceAccountName: cert-manager-cainjector + tolerations: + - key: node-role.kubernetes.io/master + operator: Exists --- diff --git a/upup/models/cloudup/resources/addons/certmanager.io/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/certmanager.io/k8s-1.16.yaml.template index 99b4d3aee6665..c6760aa0da596 100644 --- a/upup/models/cloudup/resources/addons/certmanager.io/k8s-1.16.yaml.template +++ b/upup/models/cloudup/resources/addons/certmanager.io/k8s-1.16.yaml.template @@ -26688,8 +26688,13 @@ spec: imagePullPolicy: IfNotPresent name: cert-manager resources: {} + nodeSelector: + node-role.kubernetes.io/master: "" priorityClassName: system-cluster-critical serviceAccountName: cert-manager-cainjector + tolerations: + - key: node-role.kubernetes.io/master + operator: Exists --- apiVersion: apps/v1 kind: Deployment