add mesh config upgrade during mesh upgrade

Signed-off-by: Thomas Stringer <[email protected]>

Author: trstringer

cmd/cli/mesh_upgrade.go

@@ -12,6 +12,8 @@ import (
 	"helm.sh/helm/v3/pkg/chart"
 	"helm.sh/helm/v3/pkg/chart/loader"
 	"helm.sh/helm/v3/pkg/strvals"
+
+	"github.com/openservicemesh/osm/pkg/configupgrade"
 )
 
 const upgradeDesc = `
@@ -112,6 +114,21 @@ func (u *meshUpgradeCmd) run(config *helm.Configuration) error {
 		return err
 	}
 
+	// Upgrade the MeshConfig in a way that is consistent with the new version.
+	kubeConfig, err := settings.RESTClientGetter().ToRESTConfig()
+	if err != nil {
+		return err
+	}
+	meshConfigUpgrade := configupgrade.NewMeshConfigUpgrade(
+		config,
+		kubeConfig,
+		settings.Namespace(),
+		u.meshName,
+	)
+	if err := meshConfigUpgrade.Run(); err != nil {
+		return err
+	}
+
 	fmt.Fprintf(u.out, "OSM successfully upgraded mesh [%s] in namespace [%s]\n", u.meshName, settings.Namespace())
 	return nil
 }

cmd/osm-bootstrap/osm-bootstrap.go

@@ -40,12 +40,6 @@ import (
 	"github.com/openservicemesh/osm/pkg/version"
 )
 
-const (
-	meshConfigName          = "osm-mesh-config"
-	presetMeshConfigName    = "preset-mesh-config"
-	presetMeshConfigJSONKey = "preset-mesh-config.json"
-)
-
 var (
 	verbosity          string
 	osmNamespace       string
@@ -146,7 +140,7 @@ func main() {
 
 	err = bootstrap.ensureMeshConfig()
 	if err != nil {
-		log.Fatal().Err(err).Msgf("Error setting up default MeshConfig %s from ConfigMap %s", meshConfigName, presetMeshConfigName)
+		log.Fatal().Err(err).Msgf("Error setting up default MeshConfig %s from ConfigMap %s", constants.OSMMeshConfig, constants.PresetMeshConfig)
 		return
 	}
 
@@ -213,7 +207,7 @@ func main() {
 
 func (b *bootstrap) createDefaultMeshConfig() error {
 	// find presets config map to build the default MeshConfig from that
-	presetsConfigMap, err := b.kubeClient.CoreV1().ConfigMaps(b.namespace).Get(context.TODO(), presetMeshConfigName, metav1.GetOptions{})
+	presetsConfigMap, err := b.kubeClient.CoreV1().ConfigMaps(b.namespace).Get(context.TODO(), constants.PresetMeshConfig, metav1.GetOptions{})
 
 	// If the presets MeshConfig could not be loaded return the error
 	if err != nil {
@@ -223,7 +217,7 @@ func (b *bootstrap) createDefaultMeshConfig() error {
 	// Create a default meshConfig
 	defaultMeshConfig := buildDefaultMeshConfig(presetsConfigMap)
 	if _, err := b.meshConfigClient.ConfigV1alpha1().MeshConfigs(b.namespace).Create(context.TODO(), defaultMeshConfig, metav1.CreateOptions{}); err == nil {
-		log.Info().Msgf("MeshConfig (%s) created in namespace %s", meshConfigName, b.namespace)
+		log.Info().Msgf("MeshConfig (%s) created in namespace %s", constants.OSMMeshConfig, b.namespace)
 		return nil
 	}
 
@@ -236,7 +230,7 @@ func (b *bootstrap) createDefaultMeshConfig() error {
 }
 
 func (b *bootstrap) ensureMeshConfig() error {
-	_, err := b.meshConfigClient.ConfigV1alpha1().MeshConfigs(b.namespace).Get(context.TODO(), meshConfigName, metav1.GetOptions{})
+	_, err := b.meshConfigClient.ConfigV1alpha1().MeshConfigs(b.namespace).Get(context.TODO(), constants.OSMMeshConfig, metav1.GetOptions{})
 	if err == nil {
 		return nil // default meshConfig was found
 	}
@@ -302,7 +296,7 @@ func validateCLIParams() error {
 }
 
 func buildDefaultMeshConfig(presetMeshConfigMap *corev1.ConfigMap) *v1alpha1.MeshConfig {
-	presetMeshConfig := presetMeshConfigMap.Data[presetMeshConfigJSONKey]
+	presetMeshConfig := presetMeshConfigMap.Data[constants.PresetMeshConfigJSONKey]
 	presetMeshConfigSpec := v1alpha1.MeshConfigSpec{}
 	err := json.Unmarshal([]byte(presetMeshConfig), &presetMeshConfigSpec)
 	if err != nil {
@@ -315,7 +309,7 @@ func buildDefaultMeshConfig(presetMeshConfigMap *corev1.ConfigMap) *v1alpha1.Mes
 			APIVersion: "config.openservicemesh.io/v1alpha1",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name: meshConfigName,
+			Name: constants.OSMMeshConfig,
 		},
 		Spec: presetMeshConfigSpec,
 	}

cmd/osm-bootstrap/osm-bootstrap_test.go

@@ -13,6 +13,7 @@ import (
 	fakeKube "k8s.io/client-go/kubernetes/fake"
 
 	"github.com/openservicemesh/osm/pkg/apis/config/v1alpha1"
+	"github.com/openservicemesh/osm/pkg/constants"
 	configClientset "github.com/openservicemesh/osm/pkg/gen/client/config/clientset/versioned"
 	fakeConfig "github.com/openservicemesh/osm/pkg/gen/client/config/clientset/versioned/fake"
 )
@@ -22,7 +23,7 @@ var testNamespace = "test-namespace"
 var testMeshConfig *v1alpha1.MeshConfig = &v1alpha1.MeshConfig{
 	ObjectMeta: metav1.ObjectMeta{
 		Namespace: testNamespace,
-		Name:      meshConfigName,
+		Name:      constants.OSMMeshConfig,
 	},
 	Spec: v1alpha1.MeshConfigSpec{},
 }
@@ -33,11 +34,11 @@ var testPresetMeshConfigMap *corev1.ConfigMap = &corev1.ConfigMap{
 		APIVersion: "v1",
 	},
 	ObjectMeta: metav1.ObjectMeta{
-		Name:      presetMeshConfigName,
+		Name:      constants.PresetMeshConfig,
 		Namespace: testNamespace,
 	},
 	Data: map[string]string{
-		presetMeshConfigJSONKey: `{
+		constants.PresetMeshConfigJSONKey: `{
 "sidecar": {
 	"enablePrivilegedInitContainer": false,
 	"logLevel": "error",
@@ -82,7 +83,7 @@ func TestBuildDefaultMeshConfig(t *testing.T) {
 	assert := tassert.New(t)
 
 	meshConfig := buildDefaultMeshConfig(testPresetMeshConfigMap)
-	assert.Equal(meshConfig.Name, meshConfigName)
+	assert.Equal(meshConfig.Name, constants.OSMMeshConfig)
 	assert.Equal(meshConfig.Spec.Sidecar.LogLevel, "error")
 	assert.Equal(meshConfig.Spec.Sidecar.ConfigResyncInterval, "2s")
 	assert.False(meshConfig.Spec.Sidecar.EnablePrivilegedInitContainer)
@@ -200,7 +201,7 @@ func TestCreateDefaultMeshConfig(t *testing.T) {
 			assert.Nil(err)
 		}
 
-		_, err = b.meshConfigClient.ConfigV1alpha1().MeshConfigs(b.namespace).Get(context.TODO(), meshConfigName, metav1.GetOptions{})
+		_, err = b.meshConfigClient.ConfigV1alpha1().MeshConfigs(b.namespace).Get(context.TODO(), constants.OSMMeshConfig, metav1.GetOptions{})
 		if tc.expectDefaultMeshConfig {
 			if err == nil {
 				assert.Nil(err)