Skip to content

Commit 9138cf9

Browse files
committed
automatically copy all non-overridden fields in EC installation object
1 parent af9100c commit 9138cf9

File tree

1 file changed

+11
-24
lines changed

1 file changed

+11
-24
lines changed

pkg/embeddedcluster/upgrade.go

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -54,35 +54,22 @@ func startClusterUpgrade(
5454
if err != nil {
5555
return fmt.Errorf("failed to get current installation: %w", err)
5656
}
57-
newins := &embeddedclusterv1beta1.Installation{
58-
TypeMeta: metav1.TypeMeta{
59-
APIVersion: embeddedclusterv1beta1.GroupVersion.String(),
60-
Kind: "Installation",
61-
},
62-
ObjectMeta: metav1.ObjectMeta{
63-
Name: time.Now().Format("20060102150405"),
64-
Labels: map[string]string{
65-
"replicated.com/disaster-recovery": "ec-install",
66-
},
67-
},
68-
Spec: embeddedclusterv1beta1.InstallationSpec{
69-
ClusterID: current.Spec.ClusterID,
70-
MetricsBaseURL: current.Spec.MetricsBaseURL,
71-
HighAvailability: current.Spec.HighAvailability,
72-
AirGap: current.Spec.AirGap,
73-
Network: current.Spec.Network,
74-
Proxy: current.Spec.Proxy,
75-
Artifacts: artifacts,
76-
Config: &newcfg,
77-
EndUserK0sConfigOverrides: current.Spec.EndUserK0sConfigOverrides,
78-
BinaryName: current.Spec.BinaryName,
79-
LicenseInfo: &embeddedclusterv1beta1.LicenseInfo{IsDisasterRecoverySupported: license.Spec.IsDisasterRecoverySupported},
57+
58+
newInstall := current
59+
newInstall.ObjectMeta = metav1.ObjectMeta{
60+
Name: time.Now().Format("20060102150405"),
61+
Labels: map[string]string{
62+
"replicated.com/disaster-recovery": "ec-install",
8063
},
8164
}
65+
newInstall.Spec.Artifacts = artifacts
66+
newInstall.Spec.Config = &newcfg
67+
newInstall.Spec.LicenseInfo = &embeddedclusterv1beta1.LicenseInfo{IsDisasterRecoverySupported: license.Spec.IsDisasterRecoverySupported}
68+
newInstall.Status = embeddedclusterv1beta1.InstallationStatus{}
8269

8370
log.Printf("Starting cluster upgrade to version %s...", newcfg.Version)
8471

85-
err = runClusterUpgrade(ctx, k8sClient, newins, registrySettings, license, versionLabel)
72+
err = runClusterUpgrade(ctx, k8sClient, newInstall, registrySettings, license, versionLabel)
8673
if err != nil {
8774
return fmt.Errorf("run cluster upgrade: %w", err)
8875
}

0 commit comments

Comments
 (0)