add MCO management of api-int CA

Signed-off-by: Charlie Doern <cdoern@redhat.com>
openshift · Jan 9, 2024 · 080718c · 080718c
1 parent c7a2d3b
commit 080718c
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 0 deletions.
diff --git a/machineconfiguration/v1/0000_80_controllerconfig-CustomNoUpgrade.crd.yaml b/machineconfiguration/v1/0000_80_controllerconfig-CustomNoUpgrade.crd.yaml
@@ -59,6 +59,7 @@ spec:
                 - dns
                 - images
                 - infra
+                - internalAPICert
                 - ipFamilies
                 - kubeAPIServerServingCAData
                 - network
@@ -1527,6 +1528,10 @@ spec:
                                   type: string
                   nullable: true
                   x-kubernetes-embedded-resource: true
+                internalAPICert:
+                  description: InternalAPICert is used to generate and update /etc/kubelet/kubeconfig
+                  type: string
+                  format: byte
                 internalRegistryPullSecret:
                   description: internalRegistryPullSecret is the pull secret for the internal registry, used by rpm-ostree to pull images from the internal registry if present
                   type: string

diff --git a/machineconfiguration/v1/0000_80_controllerconfig-Default.crd.yaml b/machineconfiguration/v1/0000_80_controllerconfig-Default.crd.yaml
@@ -59,6 +59,7 @@ spec:
                 - dns
                 - images
                 - infra
+                - internalAPICert
                 - ipFamilies
                 - kubeAPIServerServingCAData
                 - network
@@ -1330,6 +1331,10 @@ spec:
                                   type: string
                   nullable: true
                   x-kubernetes-embedded-resource: true
+                internalAPICert:
+                  description: InternalAPICert is used to generate and update /etc/kubelet/kubeconfig
+                  type: string
+                  format: byte
                 internalRegistryPullSecret:
                   description: internalRegistryPullSecret is the pull secret for the internal registry, used by rpm-ostree to pull images from the internal registry if present
                   type: string

diff --git a/machineconfiguration/v1/0000_80_controllerconfig-TechPreviewNoUpgrade.crd.yaml b/machineconfiguration/v1/0000_80_controllerconfig-TechPreviewNoUpgrade.crd.yaml
@@ -59,6 +59,7 @@ spec:
                 - dns
                 - images
                 - infra
+                - internalAPICert
                 - ipFamilies
                 - kubeAPIServerServingCAData
                 - network
@@ -1527,6 +1528,10 @@ spec:
                                   type: string
                   nullable: true
                   x-kubernetes-embedded-resource: true
+                internalAPICert:
+                  description: InternalAPICert is used to generate and update /etc/kubelet/kubeconfig
+                  type: string
+                  format: byte
                 internalRegistryPullSecret:
                   description: internalRegistryPullSecret is the pull secret for the internal registry, used by rpm-ostree to pull images from the internal registry if present
                   type: string

diff --git a/machineconfiguration/v1/0000_80_controllerconfig.crd.yaml b/machineconfiguration/v1/0000_80_controllerconfig.crd.yaml
@@ -58,6 +58,7 @@ spec:
                 - dns
                 - images
                 - infra
+                - internalAPICert
                 - ipFamilies
                 - kubeAPIServerServingCAData
                 - network
@@ -1329,6 +1330,10 @@ spec:
                                   type: string
                   nullable: true
                   x-kubernetes-embedded-resource: true
+                internalAPICert:
+                  description: InternalAPICert is used to generate and update /etc/kubelet/kubeconfig
+                  type: string
+                  format: byte
                 internalRegistryPullSecret:
                   description: internalRegistryPullSecret is the pull secret for the internal registry, used by rpm-ostree to pull images from the internal registry if present
                   type: string

diff --git a/machineconfiguration/v1/custom.controllerconfig.testsuite.yaml b/machineconfiguration/v1/custom.controllerconfig.testsuite.yaml
@@ -8,6 +8,7 @@ tests:
       apiVersion: machineconfiguration.openshift.io/v1
       kind: ControllerConfig
       spec:
+        internalAPICert: aaaaaaa
         additionalTrustBundle: Y2VydGlmaWNhdGUK
         baseOSContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e
         baseOSExtensionsContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e
@@ -66,6 +67,7 @@ tests:
       apiVersion: machineconfiguration.openshift.io/v1
       kind: ControllerConfig
       spec:
+        internalAPICert: aaaaaaa
         additionalTrustBundle: Y2VydGlmaWNhdGUK
         baseOSContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e
         baseOSExtensionsContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e

diff --git a/machineconfiguration/v1/stable.controllerconfig.testsuite.yaml b/machineconfiguration/v1/stable.controllerconfig.testsuite.yaml
@@ -8,6 +8,7 @@ tests:
       apiVersion: machineconfiguration.openshift.io/v1
       kind: ControllerConfig
       spec:
+        internalAPICert: aaaaaaa
         additionalTrustBundle: Y2VydGlmaWNhdGUK
         baseOSContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e
         baseOSExtensionsContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e
@@ -56,6 +57,7 @@ tests:
       apiVersion: machineconfiguration.openshift.io/v1
       kind: ControllerConfig
       spec:
+        internalAPICert: aaaaaaa
         additionalTrustBundle: Y2VydGlmaWNhdGUK
         baseOSContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e
         baseOSExtensionsContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e

diff --git a/machineconfiguration/v1/techpreview.controllerconfig.testsuite.yaml b/machineconfiguration/v1/techpreview.controllerconfig.testsuite.yaml
@@ -8,6 +8,7 @@ tests:
       apiVersion: machineconfiguration.openshift.io/v1
       kind: ControllerConfig
       spec:
+        internalAPICert: aaaaaaa
         additionalTrustBundle: Y2VydGlmaWNhdGUK
         baseOSContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e
         baseOSExtensionsContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e
@@ -66,6 +67,7 @@ tests:
       apiVersion: machineconfiguration.openshift.io/v1
       kind: ControllerConfig
       spec:
+        internalAPICert: aaaaaaa
         additionalTrustBundle: Y2VydGlmaWNhdGUK
         baseOSContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e
         baseOSExtensionsContainerImage: example.com/example/openshift-release-dev@sha256:d98795f7932441b30bb8bcfbbf05912875383fad1f2b3be08a22ec148d68607e

diff --git a/machineconfiguration/v1/types.go b/machineconfiguration/v1/types.go
@@ -100,6 +100,10 @@ type ControllerConfigSpec struct {
 	// +nullable
 	InternalRegistryPullSecret []byte `json:"internalRegistryPullSecret"`
 
+	// InternalAPICert is used to generate and update /etc/kubelet/kubeconfig
+	// +kubebuilder:validation:Required
+	InternalAPICert []byte `json:"internalAPICert"`
+
 	// images is map of images that are used by the controller to render templates under ./templates/
 	// +kubebuilder:validation:Required
 	Images map[string]string `json:"images"`

diff --git a/machineconfiguration/v1/zz_generated.deepcopy.go b/machineconfiguration/v1/zz_generated.deepcopy.go
diff --git a/machineconfiguration/v1/zz_generated.swagger_doc_generated.go b/machineconfiguration/v1/zz_generated.swagger_doc_generated.go