Skip to content
This repository was archived by the owner on Oct 28, 2024. It is now read-only.

✨ Control Plane Upgrades #290

Merged
merged 13 commits into from
Jul 20, 2022
Merged

✨ Control Plane Upgrades #290

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
88b84d7
✨ Add ControlPlane upgrade featureGate
m-messiah Jul 18, 2022
f58abed
✨ Add ControlPlane upgrade testCase
m-messiah Jul 18, 2022
6697b82
Reuse rootCA cert if the secret is present
m-messiah Jul 19, 2022
133150c
Rename featureGate to ClusterVersionApplyCurrentState
m-messiah Jul 20, 2022
08b363f
Add secrets annotations to StatefulSetSpecs
m-messiah Jul 20, 2022
947c6b3
Add metrics about upgrade
m-messiah Jul 20, 2022
5abce28
Disable etcd certificate restarts
m-messiah Jul 20, 2022
c695b42
Register metrics in controller
m-messiah Jul 20, 2022
5938bf0
Use custom buckets (the cluster upgrade is slow)
m-messiah Jul 20, 2022
1a196e3
Rename feature and ensure ETCD is not upgraded
m-messiah Jul 20, 2022
5512d30
Add clusters_upgrade_failed counter
m-messiah Jul 20, 2022
9c4f962
Do not apply ETCD upgrades, check rootCA error
m-messiah Jul 20, 2022
653785b
Use switch case instead of ifElseChain
m-messiah Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions virtualcluster/pkg/controller/controllers/clusterversion_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ var defaultClusterVersion = &v1alpha1.ClusterVersionSpec{
},
},
UpdateStrategy: appsv1.StatefulSetUpdateStrategy{
Type: appsv1.OnDeleteStatefulSetStrategyType,
Type: appsv1.RollingUpdateStatefulSetStrategyType,
},
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -247,7 +247,7 @@ var defaultClusterVersion = &v1alpha1.ClusterVersionSpec{
},
},
UpdateStrategy: appsv1.StatefulSetUpdateStrategy{
Type: appsv1.OnDeleteStatefulSetStrategyType,
Type: appsv1.RollingUpdateStatefulSetStrategyType,
},
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -302,6 +302,7 @@ var defaultClusterVersion = &v1alpha1.ClusterVersionSpec{
{
ContainerPort: 6443,
Name: "api",
Protocol: corev1.ProtocolTCP, // Must be explicit in 1.19
},
},
LivenessProbe: &corev1.Probe{
Expand Down Expand Up @@ -453,7 +454,7 @@ var defaultClusterVersion = &v1alpha1.ClusterVersionSpec{
},
},
UpdateStrategy: appsv1.StatefulSetUpdateStrategy{
Type: appsv1.OnDeleteStatefulSetStrategyType,
Type: appsv1.RollingUpdateStatefulSetStrategyType,
},
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Expand Down
23 changes: 23 additions & 0 deletions virtualcluster/pkg/controller/controllers/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package controllers

import (
"github.com/prometheus/client_golang/prometheus"
)

var (
clustersUpdatedCounter = prometheus.NewCounterVec(
prometheus.CounterOpts{
Name: "clusters_updated",
Help: "Amount of clusters upgraded by reconciler in featuregate.ClusterVersionApplyCurrentState",
},
[]string{"cluster_version", "resource_version"},
)
clustersUpdateSeconds = prometheus.NewHistogramVec(
prometheus.HistogramOpts{
Name: "clusters_update_seconds",
Help: "Duration of cluster upgrade by reconciler in featuregate.ClusterVersionApplyCurrentState",
Buckets: []float64{.1, .5, 1, 5, 10, 20, 30, 60, 90, 120, 300, 600, 900},
},
[]string{"cluster_version", "resource_version"},
)
)
2 changes: 2 additions & 0 deletions virtualcluster/pkg/controller/controllers/provisioner/provisioner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,6 @@ type Provisioner interface {
CreateVirtualCluster(ctx context.Context, vc *tenancyv1alpha1.VirtualCluster) error
DeleteVirtualCluster(ctx context.Context, vc *tenancyv1alpha1.VirtualCluster) error
GetProvisioner() string
// UpgradeVirtualCluster is used to apply current clusterversion if featuregate.VirtualClusterApplyUpdate enabled
UpgradeVirtualCluster(ctx context.Context, vc *tenancyv1alpha1.VirtualCluster) error
}
4 changes: 4 additions & 0 deletions virtualcluster/pkg/controller/controllers/provisioner/provisioner_aliyun.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,3 +288,7 @@ OuterLoop:
func (mpa *Aliyun) GetProvisioner() string {
return "aliyun"
}

func (mpa *Aliyun) UpgradeVirtualCluster(ctx context.Context, vc *tenancyv1alpha1.VirtualCluster) error {
return fmt.Errorf("not implemented")
}
Loading