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 6fe28fb612..4eed23363e 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 @@ -47,7 +47,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: certmanager.io/k8s-1.16.yaml - manifestHash: 0ad47440355c822d443ae607d7a052e93eaa024d60f69e18d925785b7ec3b406 + manifestHash: 78281c2d5d9aaaded5e035d2f7b5d00466c80f8ab55dfa2ad9f26216b2071108 name: certmanager.io selector: null version: 9.99.0 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 92e5d386d4..0be1aebe7d 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 @@ -30825,17 +30825,6 @@ spec: --- -apiVersion: v1 -kind: Namespace -metadata: - creationTimestamp: null - labels: - addon.kops.k8s.io/name: certmanager.io - app.kubernetes.io/managed-by: kops - name: cert-manager - ---- - apiVersion: v1 automountServiceAccountToken: true kind: ServiceAccount diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index d0b1a022e2..e5608aeaa3 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -54,7 +54,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: certmanager.io/k8s-1.16.yaml - manifestHash: 0ad47440355c822d443ae607d7a052e93eaa024d60f69e18d925785b7ec3b406 + manifestHash: 78281c2d5d9aaaded5e035d2f7b5d00466c80f8ab55dfa2ad9f26216b2071108 name: certmanager.io selector: null version: 9.99.0 diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content index 92e5d386d4..0be1aebe7d 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content @@ -30825,17 +30825,6 @@ spec: --- -apiVersion: v1 -kind: Namespace -metadata: - creationTimestamp: null - labels: - addon.kops.k8s.io/name: certmanager.io - app.kubernetes.io/managed-by: kops - name: cert-manager - ---- - apiVersion: v1 automountServiceAccountToken: true kind: ServiceAccount diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 7d46a4ba5d..dec11d8d7d 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -61,7 +61,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: certmanager.io/k8s-1.16.yaml - manifestHash: 0ad47440355c822d443ae607d7a052e93eaa024d60f69e18d925785b7ec3b406 + manifestHash: 78281c2d5d9aaaded5e035d2f7b5d00466c80f8ab55dfa2ad9f26216b2071108 name: certmanager.io selector: null version: 9.99.0 diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content index 92e5d386d4..0be1aebe7d 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content @@ -30825,17 +30825,6 @@ spec: --- -apiVersion: v1 -kind: Namespace -metadata: - creationTimestamp: null - labels: - addon.kops.k8s.io/name: certmanager.io - app.kubernetes.io/managed-by: kops - name: cert-manager - ---- - apiVersion: v1 automountServiceAccountToken: true kind: ServiceAccount diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 6de2591c68..a4b04be48c 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -54,7 +54,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: certmanager.io/k8s-1.16.yaml - manifestHash: 0ad47440355c822d443ae607d7a052e93eaa024d60f69e18d925785b7ec3b406 + manifestHash: 78281c2d5d9aaaded5e035d2f7b5d00466c80f8ab55dfa2ad9f26216b2071108 name: certmanager.io selector: null version: 9.99.0 diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content index 92e5d386d4..0be1aebe7d 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-certmanager.io-k8s-1.16_content @@ -30825,17 +30825,6 @@ spec: --- -apiVersion: v1 -kind: Namespace -metadata: - creationTimestamp: null - labels: - addon.kops.k8s.io/name: certmanager.io - app.kubernetes.io/managed-by: kops - name: cert-manager - ---- - apiVersion: v1 automountServiceAccountToken: true kind: ServiceAccount 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 e502d9c4c1..b97a960246 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 @@ -54,7 +54,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: certmanager.io/k8s-1.16.yaml - manifestHash: 0ad47440355c822d443ae607d7a052e93eaa024d60f69e18d925785b7ec3b406 + manifestHash: 78281c2d5d9aaaded5e035d2f7b5d00466c80f8ab55dfa2ad9f26216b2071108 name: certmanager.io selector: null version: 9.99.0 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 92e5d386d4..0be1aebe7d 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 @@ -30825,17 +30825,6 @@ spec: --- -apiVersion: v1 -kind: Namespace -metadata: - creationTimestamp: null - labels: - addon.kops.k8s.io/name: certmanager.io - app.kubernetes.io/managed-by: kops - name: cert-manager - ---- - apiVersion: v1 automountServiceAccountToken: true kind: ServiceAccount 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 b0d0de3739..72f2a18031 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 @@ -16232,11 +16232,6 @@ spec: served: true storage: true --- -apiVersion: v1 -kind: Namespace -metadata: - name: cert-manager ---- # Source: cert-manager/templates/cainjector-serviceaccount.yaml apiVersion: v1 kind: ServiceAccount diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml index 7226e81ec0..86c5116f19 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml @@ -55,7 +55,7 @@ spec: version: 9.99.0 - id: k8s-1.16 manifest: certmanager.io/k8s-1.16.yaml - manifestHash: 0ad47440355c822d443ae607d7a052e93eaa024d60f69e18d925785b7ec3b406 + manifestHash: 78281c2d5d9aaaded5e035d2f7b5d00466c80f8ab55dfa2ad9f26216b2071108 name: certmanager.io selector: null version: 9.99.0