Skip to content

Commit ce3d692

Browse files
loft-botjjafersonJosé Silva
authored
fix: vCluster upgrade 0.19.x to 0.25 (#2832) (#2840)
Upgrading vCluster was failing as the secret with the vCluster config yaml doesn't exist in vCluster versions prior to 0.20 (cherry picked from commit 49b7521) Co-authored-by: Jose Silva <jaferson123@gmail.com> Co-authored-by: José Silva <josesilva@Joses-MacBook-Pro.local>
1 parent 5a16f15 commit ce3d692

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

pkg/cli/create_helm.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ func CreateHelm(ctx context.Context, options *CreateOptions, globalFlags *flags.
326326
verb := "created"
327327
if isVClusterDeployed(release) {
328328
verb = "upgraded"
329-
currentVClusterConfig, err = getConfigfileFromSecret(ctx, vClusterName, cmd.Namespace)
329+
currentVClusterConfig, err = getConfigfileFromSecret(ctx, vClusterName, cmd.Namespace, cmd.log)
330330
if err != nil {
331331
return err
332332
}
@@ -935,7 +935,7 @@ func (cmd *createHelm) getVClusterConfigFromSnapshot(ctx context.Context) (strin
935935
return "", nil
936936
}
937937

938-
func getConfigfileFromSecret(ctx context.Context, name, namespace string) (*config.Config, error) {
938+
func getConfigfileFromSecret(ctx context.Context, name, namespace string, log log.Logger) (*config.Config, error) {
939939
secretName := "vc-config-" + name
940940

941941
kConf := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(clientcmd.NewDefaultClientConfigLoadingRules(), &clientcmd.ConfigOverrides{})
@@ -951,6 +951,10 @@ func getConfigfileFromSecret(ctx context.Context, name, namespace string) (*conf
951951

952952
secret, err := clientset.CoreV1().Secrets(namespace).Get(ctx, secretName, metav1.GetOptions{})
953953
if err != nil {
954+
if kerrors.IsNotFound(err) {
955+
log.Warnf("Secret %s not found, returning empty vCluster config", secretName)
956+
return &config.Config{}, nil
957+
}
954958
return nil, err
955959
}
956960

0 commit comments

Comments
 (0)