From e08fca1ac775492c43d1ccbbc62045a018114d7a Mon Sep 17 00:00:00 2001
From: Yuvaraj Kakaraparthi <kakaraparthy@vmware.com>
Date: Tue, 5 Oct 2021 08:45:36 -0700
Subject: [PATCH] add organizations to certificates

---
 bootstrap/kubeadm/config/certmanager/certificate.yaml         | 3 +++
 config/certmanager/certificate.yaml                           | 3 +++
 controlplane/kubeadm/config/certmanager/certificate.yaml      | 3 +++
 docs/book/src/developer/providers/v1alpha4-to-v1beta1.md      | 4 ++++
 .../infrastructure/docker/config/certmanager/certificate.yaml | 3 +++
 5 files changed, 16 insertions(+)

diff --git a/bootstrap/kubeadm/config/certmanager/certificate.yaml b/bootstrap/kubeadm/config/certmanager/certificate.yaml
index 1bcfdedf2c6b..d53b0e8e97e7 100644
--- a/bootstrap/kubeadm/config/certmanager/certificate.yaml
+++ b/bootstrap/kubeadm/config/certmanager/certificate.yaml
@@ -23,3 +23,6 @@ spec:
     kind: Issuer
     name: selfsigned-issuer
   secretName: $(SERVICE_NAME)-cert # this secret will not be prefixed, since it's not managed by kustomize
+  subject:
+    organizations:
+      - k8s-sig-cluster-lifecycle
\ No newline at end of file
diff --git a/config/certmanager/certificate.yaml b/config/certmanager/certificate.yaml
index abf6713a78cf..b1ae09af576d 100644
--- a/config/certmanager/certificate.yaml
+++ b/config/certmanager/certificate.yaml
@@ -22,3 +22,6 @@ spec:
     kind: Issuer
     name: selfsigned-issuer
   secretName: $(SERVICE_NAME)-cert # this secret will not be prefixed, since it's not managed by kustomize
+  subject:
+    organizations:
+      - k8s-sig-cluster-lifecycle
\ No newline at end of file
diff --git a/controlplane/kubeadm/config/certmanager/certificate.yaml b/controlplane/kubeadm/config/certmanager/certificate.yaml
index 1bcfdedf2c6b..d53b0e8e97e7 100644
--- a/controlplane/kubeadm/config/certmanager/certificate.yaml
+++ b/controlplane/kubeadm/config/certmanager/certificate.yaml
@@ -23,3 +23,6 @@ spec:
     kind: Issuer
     name: selfsigned-issuer
   secretName: $(SERVICE_NAME)-cert # this secret will not be prefixed, since it's not managed by kustomize
+  subject:
+    organizations:
+      - k8s-sig-cluster-lifecycle
\ No newline at end of file
diff --git a/docs/book/src/developer/providers/v1alpha4-to-v1beta1.md b/docs/book/src/developer/providers/v1alpha4-to-v1beta1.md
index 8c07b737ab5d..683558d5b8ba 100644
--- a/docs/book/src/developer/providers/v1alpha4-to-v1beta1.md
+++ b/docs/book/src/developer/providers/v1alpha4-to-v1beta1.md
@@ -22,6 +22,10 @@ The core ClusterAPI providers will support upgrade from v1alpha3 **and** v1alpha
 from v1alpha3 and v1alpha4 to v1beta1 have been implemented. If other providers also want to support the upgrade from v1alpha3 **and**
 v1alpha4, the same conversions have to be implemented.
 
+## Certificates
+
+The `serving-cert` certificates now have organization set to `k8s-sig-cluster-lifecycle`.
+
 ## Removed items
 
 ### API Fields 
diff --git a/test/infrastructure/docker/config/certmanager/certificate.yaml b/test/infrastructure/docker/config/certmanager/certificate.yaml
index 4079986e8912..0c895e1172be 100644
--- a/test/infrastructure/docker/config/certmanager/certificate.yaml
+++ b/test/infrastructure/docker/config/certmanager/certificate.yaml
@@ -22,3 +22,6 @@ spec:
     kind: Issuer
     name: selfsigned-issuer
   secretName: $(SERVICE_NAME)-cert # this secret will not be prefixed, since it's not managed by kustomize
+  subject:
+    organizations:
+      - k8s-sig-cluster-lifecycle
\ No newline at end of file