Merge pull request #28489 from deads2k/update-certs-again

Update certs again
openshift · Jan 4, 2024 · 13c8e24 · 13c8e24
2 parents 8e7a6b2 + efc9644
commit 13c8e24
Show file tree

Hide file tree

Showing 21 changed files with 7,022 additions and 8,855 deletions.
diff --git a/test/extended/operators/certs.go b/test/extended/operators/certs.go
@@ -15,6 +15,7 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
 	"github.com/openshift/api/annotations"
+	configv1 "github.com/openshift/api/config/v1"
 
 	g "github.com/onsi/ginkgo/v2"
 	o "github.com/onsi/gomega"
@@ -92,6 +93,12 @@ var _ = g.Describe("[sig-arch][Late]", func() {
 		if ok, _ := exutil.IsMicroShiftCluster(kubeClient); ok {
 			g.Skip("microshift does not auto-collect TLS.")
 		}
+		configClient := oc.AdminConfigClient()
+		infra, err := configClient.ConfigV1().Infrastructures().Get(ctx, "cluster", metav1.GetOptions{})
+		o.Expect(err).NotTo(o.HaveOccurred())
+		if infra.Status.ControlPlaneTopology == configv1.ExternalTopologyMode {
+			g.Skip("hypershift creates TLS differently and we're not yet ready.")
+		}
 
 		nodes := map[string]int{}
 		controlPlaneLabel := labels.SelectorFromSet(map[string]string{"node-role.kubernetes.io/control-plane": ""})
@@ -155,6 +162,12 @@ var _ = g.Describe("[sig-arch][Late]", func() {
 		if ok, _ := exutil.IsMicroShiftCluster(kubeClient); ok {
 			g.Skip("microshift does not auto-collect TLS.")
 		}
+		configClient := oc.AdminConfigClient()
+		infra, err := configClient.ConfigV1().Infrastructures().Get(ctx, "cluster", metav1.GetOptions{})
+		o.Expect(err).NotTo(o.HaveOccurred())
+		if infra.Status.ControlPlaneTopology == configv1.ExternalTopologyMode {
+			g.Skip("hypershift creates TLS differently and we're not yet ready.")
+		}
 
 		nodes := map[string]int{}
 		controlPlaneLabel := labels.SelectorFromSet(map[string]string{"node-role.kubernetes.io/control-plane": ""})

diff --git a/tls/autoregenerate-after-expiry/autoregenerate-after-expiry.json b/tls/autoregenerate-after-expiry/autoregenerate-after-expiry.json