Skip to content

Commit 18a991c

Browse files
qiujian16qiujian16
authored
🌱 Update the latest version to v0.15.2 (#461)
* Update the latest version to v0.15.2 Signed-off-by: Jian Qiu <[email protected]> * Set writer for printer Signed-off-by: Jian Qiu <[email protected]> --------- Signed-off-by: Jian Qiu <[email protected]>
1 parent 775e3ba commit 18a991c

File tree

12 files changed

+69
-41
lines changed

12 files changed

+69
-41
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ require (
3131
open-cluster-management.io/api v0.15.1-0.20241106012558-db876bf4ff8a
3232
open-cluster-management.io/cluster-proxy v0.4.0
3333
open-cluster-management.io/managed-serviceaccount v0.6.0
34-
open-cluster-management.io/ocm v0.15.0
34+
open-cluster-management.io/ocm v0.15.2
3535
open-cluster-management.io/sdk-go v0.15.0
3636
sigs.k8s.io/apiserver-network-proxy v0.29.0
3737
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,8 +578,8 @@ open-cluster-management.io/cluster-proxy v0.4.0 h1:rm0UDaDWe3/P3xLzwqdHtqNksKwSz
578578
open-cluster-management.io/cluster-proxy v0.4.0/go.mod h1:gTvfDHAhGezhdg4BD3ECBn6jbg2Y5PbHhV2ceW5nrB0=
579579
open-cluster-management.io/managed-serviceaccount v0.6.0 h1:qIi5T9WQJBuoGqnYGIktXbtqfQoiN2H9XU2P/6lAQiw=
580580
open-cluster-management.io/managed-serviceaccount v0.6.0/go.mod h1:G4LUTbZiyrB8c0+rqi/xnDmGlsg7Rdr4T7MPLCWhyQI=
581-
open-cluster-management.io/ocm v0.15.0 h1:anXQzvQUhM/DT8FcKVi4n8AY97IA5DVI0mb8R1wsvbs=
582-
open-cluster-management.io/ocm v0.15.0/go.mod h1:d6ubRiBaouiQ+yV+wFAmarpU7I77nXhkJnQJf8gLZC4=
581+
open-cluster-management.io/ocm v0.15.2 h1:i1b3a7mRrRVJlw9rooEFmZuHdaRVrmfoBOuEDfyxklI=
582+
open-cluster-management.io/ocm v0.15.2/go.mod h1:d6ubRiBaouiQ+yV+wFAmarpU7I77nXhkJnQJf8gLZC4=
583583
open-cluster-management.io/sdk-go v0.15.0 h1:2IAJnPfUoY6rPC5w7LhqAnvIlgekPoVW03LdZO1unIM=
584584
open-cluster-management.io/sdk-go v0.15.0/go.mod h1:fi5WBsbC5K3txKb8eRLuP0Sim/Oqz/PHX18skAEyjiA=
585585
oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo=

‎pkg/cmd/init/exec.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,14 @@ func (o *Options) run() error {
188188
}
189189

190190
if !o.ClusteradmFlags.DryRun {
191-
if err := helperwait.WaitUntilCRDReady(apiExtensionsClient, "clustermanagers.operator.open-cluster-management.io", o.wait); err != nil {
191+
if err := helperwait.WaitUntilCRDReady(
192+
o.Streams.Out, apiExtensionsClient, "clustermanagers.operator.open-cluster-management.io", o.wait); err != nil {
192193
return err
193194
}
194195
}
195196
if o.wait && !o.ClusteradmFlags.DryRun {
196197
if err := helperwait.WaitUntilRegistrationOperatorReady(
198+
o.Streams.Out,
197199
o.ClusteradmFlags.KubectlFactory,
198200
int64(o.ClusteradmFlags.Timeout)); err != nil {
199201
return err
@@ -202,6 +204,7 @@ func (o *Options) run() error {
202204

203205
if o.wait && !o.ClusteradmFlags.DryRun {
204206
if err := helperwait.WaitUntilClusterManagerRegistrationReady(
207+
o.Streams.Out,
205208
o.ClusteradmFlags.KubectlFactory,
206209
int64(o.ClusteradmFlags.Timeout)); err != nil {
207210
return err
@@ -318,6 +321,7 @@ func (o *Options) deploySingletonControlplane(kubeClient kubernetes.Interface) e
318321
// fetch the kubeconfig and get the token
319322
if o.wait && !o.ClusteradmFlags.DryRun {
320323
if err := helperwait.WaitUntilMulticlusterControlplaneReady(
324+
o.Streams.Out,
321325
o.ClusteradmFlags.KubectlFactory,
322326
o.SingletonName,
323327
int64(o.ClusteradmFlags.Timeout)); err != nil {

‎pkg/cmd/join/exec.go‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"encoding/pem"
99
"fmt"
1010
gherrors "github.com/pkg/errors"
11+
"io"
1112
"os"
1213
"reflect"
1314
"strings"
@@ -395,26 +396,30 @@ func (o *Options) applyKlusterlet(r *reader.ResourceReader, operatorClient opera
395396
}
396397

397398
if !o.ClusteradmFlags.DryRun {
398-
if err := wait.WaitUntilCRDReady(apiExtensionsClient, "klusterlets.operator.open-cluster-management.io", o.wait); err != nil {
399+
if err := wait.WaitUntilCRDReady(
400+
o.Streams.Out, apiExtensionsClient, "klusterlets.operator.open-cluster-management.io", o.wait); err != nil {
399401
return err
400402
}
401403
}
402404

403405
if !available && o.wait && !o.ClusteradmFlags.DryRun {
404-
err = waitUntilRegistrationOperatorConditionIsTrue(o.ClusteradmFlags.KubectlFactory, int64(o.ClusteradmFlags.Timeout))
406+
err = waitUntilRegistrationOperatorConditionIsTrue(
407+
o.Streams.Out, o.ClusteradmFlags.KubectlFactory, int64(o.ClusteradmFlags.Timeout))
405408
if err != nil {
406409
return err
407410
}
408411
}
409412

410413
if o.wait && !o.ClusteradmFlags.DryRun {
411414
if o.mode == string(operatorv1.InstallModeHosted) {
412-
err = waitUntilKlusterletConditionIsTrue(operatorClient, int64(o.ClusteradmFlags.Timeout), o.klusterletChartConfig.Klusterlet.Name)
415+
err = waitUntilKlusterletConditionIsTrue(
416+
o.Streams.Out, operatorClient, int64(o.ClusteradmFlags.Timeout), o.klusterletChartConfig.Klusterlet.Name)
413417
if err != nil {
414418
return err
415419
}
416420
} else {
417-
err = waitUntilKlusterletConditionIsTrue(operatorClient, int64(o.ClusteradmFlags.Timeout), o.klusterletChartConfig.Klusterlet.Name)
421+
err = waitUntilKlusterletConditionIsTrue(
422+
o.Streams.Out, operatorClient, int64(o.ClusteradmFlags.Timeout), o.klusterletChartConfig.Klusterlet.Name)
418423
if err != nil {
419424
return err
420425
}
@@ -475,6 +480,7 @@ func (o *Options) waitUntilManagedClusterIsCreated(timeout int64, clusterName st
475480
phase := &atomic.Value{}
476481
phase.Store("")
477482
operatorSpinner := printer.NewSpinnerWithStatus(
483+
o.Streams.Out,
478484
"Waiting for managed cluster to be created...",
479485
time.Millisecond*500,
480486
"Managed cluster is created.\n",
@@ -505,7 +511,7 @@ func (o *Options) waitUntilManagedClusterIsCreated(timeout int64, clusterName st
505511
})
506512
}
507513

508-
func waitUntilRegistrationOperatorConditionIsTrue(f util.Factory, timeout int64) error {
514+
func waitUntilRegistrationOperatorConditionIsTrue(w io.Writer, f util.Factory, timeout int64) error {
509515
var restConfig *rest.Config
510516
restConfig, err := f.ToRESTConfig()
511517
if err != nil {
@@ -519,6 +525,7 @@ func waitUntilRegistrationOperatorConditionIsTrue(f util.Factory, timeout int64)
519525
phase := &atomic.Value{}
520526
phase.Store("")
521527
operatorSpinner := printer.NewSpinnerWithStatus(
528+
w,
522529
"Waiting for registration operator to become ready...",
523530
time.Millisecond*500,
524531
"Registration operator is now available.\n",
@@ -556,10 +563,12 @@ func waitUntilRegistrationOperatorConditionIsTrue(f util.Factory, timeout int64)
556563
}
557564

558565
// Wait until the klusterlet condition available=true, or timeout in $timeout seconds
559-
func waitUntilKlusterletConditionIsTrue(client operatorclient.Interface, timeout int64, klusterletName string) error {
566+
func waitUntilKlusterletConditionIsTrue(
567+
w io.Writer, client operatorclient.Interface, timeout int64, klusterletName string) error {
560568
phase := &atomic.Value{}
561569
phase.Store("")
562570
klusterletSpinner := printer.NewSpinnerWithStatus(
571+
w,
563572
"Waiting for klusterlet agent to become ready...",
564573
time.Millisecond*500,
565574
"Klusterlet is now available.\n",

‎pkg/cmd/upgrade/clustermanager/exec.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,14 @@ func (o *Options) run() error {
102102
}
103103

104104
if !o.ClusteradmFlags.DryRun {
105-
if err := wait.WaitUntilCRDReady(apiExtensionsClient, "clustermanagers.operator.open-cluster-management.io", o.wait); err != nil {
105+
if err := wait.WaitUntilCRDReady(
106+
o.Streams.Out, apiExtensionsClient, "clustermanagers.operator.open-cluster-management.io", o.wait); err != nil {
106107
return err
107108
}
108109
}
109110
if o.wait && !o.ClusteradmFlags.DryRun {
110111
if err := wait.WaitUntilRegistrationOperatorReady(
112+
o.Streams.Out,
111113
o.ClusteradmFlags.KubectlFactory,
112114
int64(o.ClusteradmFlags.Timeout)); err != nil {
113115
return err

‎pkg/cmd/upgrade/klusterlet/exec.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,14 @@ func (o *Options) run() error {
118118
}
119119

120120
if !o.ClusteradmFlags.DryRun {
121-
if err := wait.WaitUntilCRDReady(apiExtensionsClient, "klusterlets.operator.open-cluster-management.io", o.wait); err != nil {
121+
if err := wait.WaitUntilCRDReady(
122+
o.Streams.Out, apiExtensionsClient, "klusterlets.operator.open-cluster-management.io", o.wait); err != nil {
122123
return err
123124
}
124125
}
125126
if o.wait && !o.ClusteradmFlags.DryRun {
126127
if err := wait.WaitUntilRegistrationOperatorReady(
128+
o.Streams.Out,
127129
o.ClusteradmFlags.KubectlFactory,
128130
int64(o.ClusteradmFlags.Timeout)); err != nil {
129131
return err

‎pkg/helpers/printer/prefixwriter.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,19 @@ type flusher interface {
6969
Flush()
7070
}
7171

72-
func NewSpinner(suffix string, interval time.Duration) *spinner.Spinner {
72+
func NewSpinner(w io.Writer, suffix string, interval time.Duration) *spinner.Spinner {
7373
return spinner.New(
7474
spinner.CharSets[14],
7575
interval,
76+
spinner.WithWriter(w),
7677
spinner.WithColor("green"),
7778
spinner.WithHiddenCursor(true),
7879
spinner.WithSuffix(suffixColor.Sprintf(" %s", suffix)))
7980
}
8081

81-
func NewSpinnerWithStatus(suffix string, interval time.Duration, final string, statusFunc func() string) *spinner.Spinner {
82-
s := NewSpinner(suffix, interval)
82+
func NewSpinnerWithStatus(
83+
w io.Writer, suffix string, interval time.Duration, final string, statusFunc func() string) *spinner.Spinner {
84+
s := NewSpinner(w, suffix, interval)
8385
s.FinalMSG = final
8486
s.PreUpdate = func(s *spinner.Spinner) {
8587
status := statusFunc()

‎pkg/helpers/wait/wait.go‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package wait
44
import (
55
"context"
66
"fmt"
7+
"io"
78
"sync/atomic"
89
"time"
910

@@ -21,20 +22,20 @@ import (
2122
"open-cluster-management.io/clusteradm/pkg/helpers/printer"
2223
)
2324

24-
func WaitUntilCRDReady(apiExtensionsClient apiextensionsclient.Interface, crdName string, wait bool) error {
25+
func WaitUntilCRDReady(w io.Writer, apiExtensionsClient apiextensionsclient.Interface, crdName string, wait bool) error {
2526
b := retry.DefaultBackoff
2627
b.Duration = 200 * time.Millisecond
2728

2829
if wait {
29-
crdSpinner := printer.NewSpinner("Waiting for CRD to be ready...", time.Second)
30+
crdSpinner := printer.NewSpinner(w, "Waiting for CRD to be ready...", time.Second)
3031
crdSpinner.FinalMSG = "CRD successfully registered.\n"
3132
crdSpinner.Start()
3233
defer crdSpinner.Stop()
3334
}
3435
return helpers.WaitCRDToBeReady(apiExtensionsClient, crdName, b, wait)
3536
}
3637

37-
func WaitUntilRegistrationOperatorReady(f util.Factory, timeout int64) error {
38+
func WaitUntilRegistrationOperatorReady(w io.Writer, f util.Factory, timeout int64) error {
3839
var restConfig *rest.Config
3940
restConfig, err := f.ToRESTConfig()
4041
if err != nil {
@@ -49,6 +50,7 @@ func WaitUntilRegistrationOperatorReady(f util.Factory, timeout int64) error {
4950
phase.Store("")
5051
text := "Waiting for registration operator to become ready..."
5152
operatorSpinner := printer.NewSpinnerWithStatus(
53+
w,
5254
text,
5355
time.Second,
5456
"Registration operator is now available.\n",
@@ -85,7 +87,7 @@ func WaitUntilRegistrationOperatorReady(f util.Factory, timeout int64) error {
8587
})
8688
}
8789

88-
func WaitUntilClusterManagerRegistrationReady(f util.Factory, timeout int64) error {
90+
func WaitUntilClusterManagerRegistrationReady(w io.Writer, f util.Factory, timeout int64) error {
8991
var restConfig *rest.Config
9092
restConfig, err := f.ToRESTConfig()
9193
if err != nil {
@@ -100,6 +102,7 @@ func WaitUntilClusterManagerRegistrationReady(f util.Factory, timeout int64) err
100102
phase.Store("")
101103
text := "Waiting for cluster manager registration to become ready..."
102104
clusterManagerSpinner := printer.NewSpinnerWithStatus(
105+
w,
103106
text,
104107
time.Second,
105108
"ClusterManager registration is now available.\n",
@@ -136,7 +139,7 @@ func WaitUntilClusterManagerRegistrationReady(f util.Factory, timeout int64) err
136139
})
137140
}
138141

139-
func WaitUntilMulticlusterControlplaneReady(f util.Factory, ns string, timeout int64) error {
142+
func WaitUntilMulticlusterControlplaneReady(w io.Writer, f util.Factory, ns string, timeout int64) error {
140143
var restConfig *rest.Config
141144
restConfig, err := f.ToRESTConfig()
142145
if err != nil {
@@ -151,6 +154,7 @@ func WaitUntilMulticlusterControlplaneReady(f util.Factory, ns string, timeout i
151154
phase.Store("")
152155
text := "Waiting for multicluster controlplane to become ready..."
153156
clusterManagerSpinner := printer.NewSpinnerWithStatus(
157+
w,
154158
text,
155159
time.Second,
156160
"Multicluster controlplane is now available.\n",

‎pkg/version/version.go‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type VersionBundle struct {
4242
MulticlusterControlplane string
4343
}
4444

45-
var defaultBundleVersion = "0.15.0"
45+
var defaultBundleVersion = "0.15.2"
4646

4747
func GetDefaultBundleVersion() string {
4848
return defaultBundleVersion
@@ -106,6 +106,13 @@ func GetVersionBundle(version string) (VersionBundle, error) {
106106
MulticlusterControlplane: "v0.6.0",
107107
}
108108

109+
versionBundleList["0.15.2"] = VersionBundle{
110+
OCM: "v0.15.2",
111+
AppAddon: "v0.15.0",
112+
PolicyAddon: "v0.15.0",
113+
MulticlusterControlplane: "v0.6.0",
114+
}
115+
109116
// default
110117
versionBundleList["default"] = versionBundleList[defaultBundleVersion]
111118

‎vendor/modules.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,7 @@ open-cluster-management.io/managed-serviceaccount/pkg/generated/clientset/versio
12611261
open-cluster-management.io/managed-serviceaccount/pkg/generated/clientset/versioned/scheme
12621262
open-cluster-management.io/managed-serviceaccount/pkg/generated/clientset/versioned/typed/authentication/v1alpha1
12631263
open-cluster-management.io/managed-serviceaccount/pkg/generated/clientset/versioned/typed/authentication/v1beta1
1264-
# open-cluster-management.io/ocm v0.15.0
1264+
# open-cluster-management.io/ocm v0.15.2
12651265
## explicit; go 1.22.5
12661266
open-cluster-management.io/ocm/deploy/cluster-manager/chart
12671267
open-cluster-management.io/ocm/deploy/klusterlet/chart

0 commit comments

Comments
 (0)