Refactor Controller Logic and Add Integration Tests

canonical · Oct 24, 2024 · 5624b82 · 5624b82
1 parent 5887593
commit 5624b82
Show file tree

Hide file tree

Showing 11 changed files with 423 additions and 148 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -65,6 +65,7 @@ jobs:
           - "Workload cluster creation"
           - "Workload cluster scaling"
           - "Workload cluster upgrade"
+          - "Certificate Refresh"
       # TODO(ben): Remove once all tests are running stable.
       fail-fast: false
     steps:

diff --git a/bootstrap/api/v1beta2/certificates_refresh_consts.go b/bootstrap/api/v1beta2/certificates_refresh_consts.go
@@ -1,7 +1,14 @@
 package v1beta2
 
 const (
-	CertificatesRefreshAnnotation = "v1beta2.k8sd.io/refresh-certificates"
+	CertificatesRefreshAnnotation       = "v1beta2.k8sd.io/refresh-certificates"
+	CertificatesRefreshStatusAnnotation = "v1beta2.k8sd.io/refresh-certificates-status"
+)
+
+const (
+	CertificatesRefreshInProgressStatus = "in-progress"
+	CertificatesRefreshDoneStatus       = "done"
+	CertificatesRefreshFailedStatus     = "failed"
 )
 
 const (

diff --git a/bootstrap/config/crd/bases/bootstrap.cluster.x-k8s.io_ck8sconfigs.yaml b/bootstrap/config/crd/bases/bootstrap.cluster.x-k8s.io_ck8sconfigs.yaml
@@ -51,9 +51,6 @@ spec:
                 items:
                   type: string
                 type: array
-              channel:
-                description: Channel is the channel to use for the snap install.
-                type: string
               bootstrapConfig:
                 description: BootstrapConfig is the data to be passed to the bootstrap
                   script.
@@ -87,6 +84,9 @@ spec:
                     - secret
                     type: object
                 type: object
+              channel:
+                description: Channel is the channel to use for the snap install.
+                type: string
               controlPlane:
                 description: CK8sControlPlaneConfig is configuration for the control
                   plane node.

diff --git a/bootstrap/config/crd/bases/bootstrap.cluster.x-k8s.io_ck8sconfigtemplates.yaml b/bootstrap/config/crd/bases/bootstrap.cluster.x-k8s.io_ck8sconfigtemplates.yaml
@@ -58,9 +58,6 @@ spec:
                         items:
                           type: string
                         type: array
-                      channel:
-                        description: Channel is the channel to use for the snap install.
-                        type: string
                       bootstrapConfig:
                         description: BootstrapConfig is the data to be passed to the
                           bootstrap script.
@@ -94,6 +91,9 @@ spec:
                             - secret
                             type: object
                         type: object
+                      channel:
+                        description: Channel is the channel to use for the snap install.
+                        type: string
                       controlPlane:
                         description: CK8sControlPlaneConfig is configuration for the
                           control plane node.