Skip to content

Commit 509fc14

Browse files
zhujian7zhujian7
authored
Apply crds first (#477)
Signed-off-by: zhujian <[email protected]>
1 parent b07b962 commit 509fc14

File tree

8 files changed

+64
-40
lines changed

8 files changed

+64
-40
lines changed

‎go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ require (
2828
k8s.io/klog/v2 v2.130.1
2929
k8s.io/kubectl v0.31.1
3030
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
31-
open-cluster-management.io/api v0.15.1-0.20250226073118-8c9793267c9e
31+
open-cluster-management.io/api v0.16.1
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.1-0.20250306192929-c4e706f12358
35-
open-cluster-management.io/sdk-go v0.15.1-0.20241125015855-1536c3970f8f
34+
open-cluster-management.io/ocm v0.15.1-0.20250312033809-a5f3912a6632
35+
open-cluster-management.io/sdk-go v0.16.0
3636
sigs.k8s.io/apiserver-network-proxy v0.29.0
3737
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3
3838
sigs.k8s.io/controller-runtime v0.19.3

‎go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -563,16 +563,16 @@ k8s.io/kubectl v0.31.1 h1:ih4JQJHxsEggFqDJEHSOdJ69ZxZftgeZvYo7M/cpp24=
563563
k8s.io/kubectl v0.31.1/go.mod h1:aNuQoR43W6MLAtXQ/Bu4GDmoHlbhHKuyD49lmTC8eJM=
564564
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 h1:MDF6h2H/h4tbzmtIKTuctcwZmY0tY9mD9fNT47QO6HI=
565565
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
566-
open-cluster-management.io/api v0.15.1-0.20250226073118-8c9793267c9e h1:4iQneGfxartfFSR+IHZRrjEuwtRpiHyKQ15Kd33YCVk=
567-
open-cluster-management.io/api v0.15.1-0.20250226073118-8c9793267c9e/go.mod h1:9erZEWEn4bEqh0nIX2wA7f/s3KCuFycQdBrPrRzi0QM=
566+
open-cluster-management.io/api v0.16.1 h1:mS+4UGxHLPQd7CRM0gdFQdVaz139Lo2bkLfqSE0CDNU=
567+
open-cluster-management.io/api v0.16.1/go.mod h1:9erZEWEn4bEqh0nIX2wA7f/s3KCuFycQdBrPrRzi0QM=
568568
open-cluster-management.io/cluster-proxy v0.4.0 h1:rm0UDaDWe3/P3xLzwqdHtqNksKwSzsic02MkrEe6BnM=
569569
open-cluster-management.io/cluster-proxy v0.4.0/go.mod h1:gTvfDHAhGezhdg4BD3ECBn6jbg2Y5PbHhV2ceW5nrB0=
570570
open-cluster-management.io/managed-serviceaccount v0.6.0 h1:qIi5T9WQJBuoGqnYGIktXbtqfQoiN2H9XU2P/6lAQiw=
571571
open-cluster-management.io/managed-serviceaccount v0.6.0/go.mod h1:G4LUTbZiyrB8c0+rqi/xnDmGlsg7Rdr4T7MPLCWhyQI=
572-
open-cluster-management.io/ocm v0.15.1-0.20250306192929-c4e706f12358 h1:cI1iF80iMHrO1GMB6c8HBXvWUqFDByW4aP0QWcI2fag=
573-
open-cluster-management.io/ocm v0.15.1-0.20250306192929-c4e706f12358/go.mod h1:TpRPBEiYJj8ZoVmuDIJS+nJlixRv2fnp/a54uXSWd38=
574-
open-cluster-management.io/sdk-go v0.15.1-0.20241125015855-1536c3970f8f h1:zeC7QrFNarfK2zY6jGtd+mX+yDrQQmnH/J8A7n5Nh38=
575-
open-cluster-management.io/sdk-go v0.15.1-0.20241125015855-1536c3970f8f/go.mod h1:fi5WBsbC5K3txKb8eRLuP0Sim/Oqz/PHX18skAEyjiA=
572+
open-cluster-management.io/ocm v0.15.1-0.20250312033809-a5f3912a6632 h1:WQTYSwv8UT1LMErff8/kTTG49zeKiWcE4pVUn0zIofE=
573+
open-cluster-management.io/ocm v0.15.1-0.20250312033809-a5f3912a6632/go.mod h1:M2/9PVwAYtP2Rv9ahsUEcGGXUctPPVlqhzrBKRW4Wzs=
574+
open-cluster-management.io/sdk-go v0.16.0 h1:Ui1jerkeLaNaJPu47xjOJ3lh+rJQgeJHD25ViQMzAMs=
575+
open-cluster-management.io/sdk-go v0.16.0/go.mod h1:TyOjZC5YxyM5BRNgwTmLuTbHXX6xXqzYBXllrfoVp9w=
576576
oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo=
577577
oras.land/oras-go v1.2.5/go.mod h1:PuAwRShRZCsZb7g8Ar3jKKQR/2A/qN+pkYxIOd/FAoo=
578578
sigs.k8s.io/apiserver-network-proxy v0.29.0 h1:4N+QiVBucLicDSP8V1Izf5h4t8DsKFZ346hA8kQlXDw=

‎pkg/cmd/init/exec.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,14 @@ func (o *Options) run() error {
206206
}
207207

208208
r := reader.NewResourceReader(o.ClusteradmFlags.KubectlFactory, o.ClusteradmFlags.DryRun, o.Streams)
209-
raw, err := chart.RenderClusterManagerChart(
209+
crds, raw, err := chart.RenderClusterManagerChart(
210210
o.clusterManagerChartConfig,
211211
"open-cluster-management")
212212
if err != nil {
213213
return err
214214
}
215215

216-
if err := r.ApplyRaw(raw); err != nil {
216+
if err := r.ApplyRaw(crds); err != nil {
217217
return err
218218
}
219219

@@ -223,6 +223,11 @@ func (o *Options) run() error {
223223
return err
224224
}
225225
}
226+
227+
if err := r.ApplyRaw(raw); err != nil {
228+
return err
229+
}
230+
226231
if o.wait && !o.ClusteradmFlags.DryRun {
227232
if err := helperwait.WaitUntilRegistrationOperatorReady(
228233
o.Streams.Out,

‎pkg/cmd/join/exec.go

+8-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ import (
77
"crypto/x509"
88
"encoding/pem"
99
"fmt"
10-
gherrors "github.com/pkg/errors"
1110
"io"
1211
"os"
1312
"reflect"
1413
"strings"
1514
"sync/atomic"
1615
"time"
1716

17+
gherrors "github.com/pkg/errors"
18+
1819
"github.com/ghodss/yaml"
1920
"github.com/spf13/cobra"
2021
corev1 "k8s.io/api/core/v1"
@@ -386,12 +387,12 @@ func (o *Options) applyKlusterlet(r *reader.ResourceReader, operatorClient opera
386387
o.klusterletChartConfig.NoOperator = true
387388
}
388389

389-
raw, err := chart.RenderKlusterletChart(o.klusterletChartConfig, OperatorNamesapce)
390+
crds, raw, err := chart.RenderKlusterletChart(o.klusterletChartConfig, OperatorNamesapce)
390391
if err != nil {
391392
return err
392393
}
393394

394-
if err := r.ApplyRaw(raw); err != nil {
395+
if err := r.ApplyRaw(crds); err != nil {
395396
return err
396397
}
397398

@@ -402,6 +403,10 @@ func (o *Options) applyKlusterlet(r *reader.ResourceReader, operatorClient opera
402403
}
403404
}
404405

406+
if err := r.ApplyRaw(raw); err != nil {
407+
return err
408+
}
409+
405410
if !available && o.wait && !o.ClusteradmFlags.DryRun {
406411
err = waitUntilRegistrationOperatorConditionIsTrue(
407412
o.Streams.Out, o.ClusteradmFlags.KubectlFactory, int64(o.ClusteradmFlags.Timeout))

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

+7-2
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ func (o *Options) run() error {
9090
return err
9191
}
9292

93-
raw, err := chart.RenderClusterManagerChart(
93+
crds, raw, err := chart.RenderClusterManagerChart(
9494
o.clusterManagerChartConfig,
9595
"open-cluster-management")
9696
if err != nil {
9797
return err
9898
}
9999

100-
if err := r.ApplyRaw(raw); err != nil {
100+
if err := r.ApplyRaw(crds); err != nil {
101101
return err
102102
}
103103

@@ -107,6 +107,11 @@ func (o *Options) run() error {
107107
return err
108108
}
109109
}
110+
111+
if err := r.ApplyRaw(raw); err != nil {
112+
return err
113+
}
114+
110115
if o.wait && !o.ClusteradmFlags.DryRun {
111116
if err := wait.WaitUntilRegistrationOperatorReady(
112117
o.Streams.Out,

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

+7-2
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@ func (o *Options) run() error {
106106
return err
107107
}
108108

109-
raw, err := chart.RenderKlusterletChart(
109+
crds, raw, err := chart.RenderKlusterletChart(
110110
o.klusterletChartConfig,
111111
"open-cluster-management")
112112
if err != nil {
113113
return err
114114
}
115115

116-
if err := r.ApplyRaw(raw); err != nil {
116+
if err := r.ApplyRaw(crds); err != nil {
117117
return err
118118
}
119119

@@ -123,6 +123,11 @@ func (o *Options) run() error {
123123
return err
124124
}
125125
}
126+
127+
if err := r.ApplyRaw(raw); err != nil {
128+
return err
129+
}
130+
126131
if o.wait && !o.ClusteradmFlags.DryRun {
127132
if err := wait.WaitUntilRegistrationOperatorReady(
128133
o.Streams.Out,

‎vendor/modules.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1245,7 +1245,7 @@ k8s.io/utils/pointer
12451245
k8s.io/utils/ptr
12461246
k8s.io/utils/strings/slices
12471247
k8s.io/utils/trace
1248-
# open-cluster-management.io/api v0.15.1-0.20250226073118-8c9793267c9e
1248+
# open-cluster-management.io/api v0.16.1
12491249
## explicit; go 1.22.0
12501250
open-cluster-management.io/api/addon/v1alpha1
12511251
open-cluster-management.io/api/client/addon/clientset/versioned
@@ -1288,12 +1288,12 @@ open-cluster-management.io/managed-serviceaccount/pkg/generated/clientset/versio
12881288
open-cluster-management.io/managed-serviceaccount/pkg/generated/clientset/versioned/scheme
12891289
open-cluster-management.io/managed-serviceaccount/pkg/generated/clientset/versioned/typed/authentication/v1alpha1
12901290
open-cluster-management.io/managed-serviceaccount/pkg/generated/clientset/versioned/typed/authentication/v1beta1
1291-
# open-cluster-management.io/ocm v0.15.1-0.20250306192929-c4e706f12358
1291+
# open-cluster-management.io/ocm v0.15.1-0.20250312033809-a5f3912a6632
12921292
## explicit; go 1.22.5
12931293
open-cluster-management.io/ocm/deploy/cluster-manager/chart
12941294
open-cluster-management.io/ocm/deploy/klusterlet/chart
12951295
open-cluster-management.io/ocm/pkg/operator/helpers/chart
1296-
# open-cluster-management.io/sdk-go v0.15.1-0.20241125015855-1536c3970f8f
1296+
# open-cluster-management.io/sdk-go v0.16.0
12971297
## explicit; go 1.22.0
12981298
open-cluster-management.io/sdk-go/pkg/apis/cluster/v1beta1
12991299
open-cluster-management.io/sdk-go/pkg/apis/cluster/v1beta2

‎vendor/open-cluster-management.io/ocm/pkg/operator/helpers/chart/render.go

+23-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)