Merge branch 'main' into KU-1602/refresh-worker-certs

canonical · Oct 25, 2024 · a84806a · a84806a
2 parents cdb76e0 + 05b0352
commit a84806a
Show file tree

Hide file tree

Showing 39 changed files with 1,998 additions and 173 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -66,6 +66,7 @@ jobs:
           - "Workload cluster scaling"
           - "Workload cluster upgrade"
           - "Certificate Refresh"
+          - "Orchestrated In place upgrades"
       # TODO(ben): Remove once all tests are running stable.
       fail-fast: false
     steps:

diff --git a/Makefile b/Makefile
@@ -99,7 +99,8 @@ GINKGO_NODES ?= 1 # GINKGO_NODES is the number of parallel nodes to run
 GINKGO_TIMEOUT ?= 2h
 GINKGO_POLL_PROGRESS_AFTER ?= 60m
 GINKGO_POLL_PROGRESS_INTERVAL ?= 5m
-E2E_CONF_FILE ?= $(TEST_DIR)/e2e/config/ck8s-docker.yaml
+E2E_INFRA ?= docker
+E2E_CONF_FILE ?= $(TEST_DIR)/e2e/config/ck8s-$(E2E_INFRA).yaml
 SKIP_RESOURCE_CLEANUP ?= false
 USE_EXISTING_CLUSTER ?= false
 GINKGO_NOCOLOR ?= false

diff --git a/bootstrap/api/v1beta2/ck8sconfig_types.go b/bootstrap/api/v1beta2/ck8sconfig_types.go
@@ -69,6 +69,18 @@ type CK8sConfigSpec struct {
 	// +optional
 	SnapstoreProxyID string `json:"snapstoreProxyId,omitempty"`
 
+	// HTTPSProxy is optional https proxy configuration
+	// +optional
+	HTTPSProxy string `json:"httpsProxy,omitempty"`
+
+	// HTTPProxy is optional http proxy configuration
+	// +optional
+	HTTPProxy string `json:"httpProxy,omitempty"`
+
+	// NoProxy is optional no proxy configuration
+	// +optional
+	NoProxy string `json:"noProxy,omitempty"`
+
 	// Channel is the channel to use for the snap install.
 	// +optional
 	Channel string `json:"channel,omitempty"`

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
@@ -201,6 +201,12 @@ spec:
                   - path
                   type: object
                 type: array
+              httpProxy:
+                description: HTTPProxy is optional http proxy configuration
+                type: string
+              httpsProxy:
+                description: HTTPSProxy is optional https proxy configuration
+                type: string
               initConfig:
                 description: CK8sInitConfig is configuration for the initializing
                   the cluster features.
@@ -233,6 +239,9 @@ spec:
                   LocalPath is the path of a local snap file in the workload cluster to use for the snap install.
                   If Channel or Revision are set, this will be ignored.
                 type: string
+              noProxy:
+                description: NoProxy is optional no proxy configuration
+                type: string
               nodeName:
                 description: |-
                   NodeName is the name to use for the kubelet of this node. It is needed for clouds

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
@@ -210,6 +210,12 @@ spec:
                           - path
                           type: object
                         type: array
+                      httpProxy:
+                        description: HTTPProxy is optional http proxy configuration
+                        type: string
+                      httpsProxy:
+                        description: HTTPSProxy is optional https proxy configuration
+                        type: string
                       initConfig:
                         description: CK8sInitConfig is configuration for the initializing
                           the cluster features.
@@ -242,6 +248,9 @@ spec:
                           LocalPath is the path of a local snap file in the workload cluster to use for the snap install.
                           If Channel or Revision are set, this will be ignored.
                         type: string
+                      noProxy:
+                        description: NoProxy is optional no proxy configuration
+                        type: string
                       nodeName:
                         description: |-
                           NodeName is the name to use for the kubelet of this node. It is needed for clouds

diff --git a/bootstrap/controllers/ck8sconfig_controller.go b/bootstrap/controllers/ck8sconfig_controller.go
@@ -378,6 +378,9 @@ func (r *CK8sConfigReconciler) joinWorker(ctx context.Context, scope *Scope) err
 			ConfigFileContents:   string(joinConfig),
 			MicroclusterAddress:  scope.Config.Spec.ControlPlaneConfig.MicroclusterAddress,
 			MicroclusterPort:     microclusterPort,
+			HTTPProxy:            scope.Config.Spec.HTTPProxy,
+			HTTPSProxy:           scope.Config.Spec.HTTPSProxy,
+			NoProxy:              scope.Config.Spec.NoProxy,
 			AirGapped:            scope.Config.Spec.AirGapped,
 			SnapstoreProxyScheme: scope.Config.Spec.SnapstoreProxyScheme,
 			SnapstoreProxyDomain: scope.Config.Spec.SnapstoreProxyDomain,
@@ -693,6 +696,9 @@ func (r *CK8sConfigReconciler) handleClusterNotInitialized(ctx context.Context,
 			MicroclusterAddress:  scope.Config.Spec.ControlPlaneConfig.MicroclusterAddress,
 			MicroclusterPort:     microclusterPort,
 			NodeName:             scope.Config.Spec.NodeName,
+			HTTPProxy:            scope.Config.Spec.HTTPProxy,
+			HTTPSProxy:           scope.Config.Spec.HTTPSProxy,
+			NoProxy:              scope.Config.Spec.NoProxy,
 			AirGapped:            scope.Config.Spec.AirGapped,
 			SnapstoreProxyScheme: scope.Config.Spec.SnapstoreProxyScheme,
 			SnapstoreProxyDomain: scope.Config.Spec.SnapstoreProxyDomain,

diff --git a/c1.yaml b/c1.yaml
diff --git a/controlplane/config/crd/bases/controlplane.cluster.x-k8s.io_ck8scontrolplanes.yaml b/controlplane/config/crd/bases/controlplane.cluster.x-k8s.io_ck8scontrolplanes.yaml
@@ -398,6 +398,12 @@ spec:
                       - path
                       type: object
                     type: array
+                  httpProxy:
+                    description: HTTPProxy is optional http proxy configuration
+                    type: string
+                  httpsProxy:
+                    description: HTTPSProxy is optional https proxy configuration
+                    type: string
                   initConfig:
                     description: CK8sInitConfig is configuration for the initializing
                       the cluster features.
@@ -430,6 +436,9 @@ spec:
                       LocalPath is the path of a local snap file in the workload cluster to use for the snap install.
                       If Channel or Revision are set, this will be ignored.
                     type: string
+                  noProxy:
+                    description: NoProxy is optional no proxy configuration
+                    type: string
                   nodeName:
                     description: |-
                       NodeName is the name to use for the kubelet of this node. It is needed for clouds

diff --git a/controlplane/config/crd/bases/controlplane.cluster.x-k8s.io_ck8scontrolplanetemplates.yaml b/controlplane/config/crd/bases/controlplane.cluster.x-k8s.io_ck8scontrolplanetemplates.yaml
@@ -376,6 +376,12 @@ spec:
                               - path
                               type: object
                             type: array
+                          httpProxy:
+                            description: HTTPProxy is optional http proxy configuration
+                            type: string
+                          httpsProxy:
+                            description: HTTPSProxy is optional https proxy configuration
+                            type: string
                           initConfig:
                             description: CK8sInitConfig is configuration for the initializing
                               the cluster features.
@@ -408,6 +414,9 @@ spec:
                               LocalPath is the path of a local snap file in the workload cluster to use for the snap install.
                               If Channel or Revision are set, this will be ignored.
                             type: string
+                          noProxy:
+                            description: NoProxy is optional no proxy configuration
+                            type: string
                           nodeName:
                             description: |-
                               NodeName is the name to use for the kubelet of this node. It is needed for clouds

diff --git a/controlplane/config/rbac/role.yaml b/controlplane/config/rbac/role.yaml
@@ -48,6 +48,25 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - machinesets
+  - machinesets/status
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - watch
 - apiGroups:
   - ""
   resources: