Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 Apply crds first #477

Merged
merged 1 commit into from
Mar 12, 2025
+64 −40
Merged

🐛 Apply crds first #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ require (
k8s.io/klog/v2 v2.130.1
k8s.io/kubectl v0.31.1
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
open-cluster-management.io/api v0.15.1-0.20250226073118-8c9793267c9e
open-cluster-management.io/api v0.16.1
open-cluster-management.io/cluster-proxy v0.4.0
open-cluster-management.io/managed-serviceaccount v0.6.0
open-cluster-management.io/ocm v0.15.1-0.20250306192929-c4e706f12358
open-cluster-management.io/sdk-go v0.15.1-0.20241125015855-1536c3970f8f
open-cluster-management.io/ocm v0.15.1-0.20250312033809-a5f3912a6632
open-cluster-management.io/sdk-go v0.16.0
sigs.k8s.io/apiserver-network-proxy v0.29.0
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3
sigs.k8s.io/controller-runtime v0.19.3
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,16 +563,16 @@ k8s.io/kubectl v0.31.1 h1:ih4JQJHxsEggFqDJEHSOdJ69ZxZftgeZvYo7M/cpp24=
k8s.io/kubectl v0.31.1/go.mod h1:aNuQoR43W6MLAtXQ/Bu4GDmoHlbhHKuyD49lmTC8eJM=
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 h1:MDF6h2H/h4tbzmtIKTuctcwZmY0tY9mD9fNT47QO6HI=
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
open-cluster-management.io/api v0.15.1-0.20250226073118-8c9793267c9e h1:4iQneGfxartfFSR+IHZRrjEuwtRpiHyKQ15Kd33YCVk=
open-cluster-management.io/api v0.15.1-0.20250226073118-8c9793267c9e/go.mod h1:9erZEWEn4bEqh0nIX2wA7f/s3KCuFycQdBrPrRzi0QM=
open-cluster-management.io/api v0.16.1 h1:mS+4UGxHLPQd7CRM0gdFQdVaz139Lo2bkLfqSE0CDNU=
open-cluster-management.io/api v0.16.1/go.mod h1:9erZEWEn4bEqh0nIX2wA7f/s3KCuFycQdBrPrRzi0QM=
open-cluster-management.io/cluster-proxy v0.4.0 h1:rm0UDaDWe3/P3xLzwqdHtqNksKwSzsic02MkrEe6BnM=
open-cluster-management.io/cluster-proxy v0.4.0/go.mod h1:gTvfDHAhGezhdg4BD3ECBn6jbg2Y5PbHhV2ceW5nrB0=
open-cluster-management.io/managed-serviceaccount v0.6.0 h1:qIi5T9WQJBuoGqnYGIktXbtqfQoiN2H9XU2P/6lAQiw=
open-cluster-management.io/managed-serviceaccount v0.6.0/go.mod h1:G4LUTbZiyrB8c0+rqi/xnDmGlsg7Rdr4T7MPLCWhyQI=
open-cluster-management.io/ocm v0.15.1-0.20250306192929-c4e706f12358 h1:cI1iF80iMHrO1GMB6c8HBXvWUqFDByW4aP0QWcI2fag=
open-cluster-management.io/ocm v0.15.1-0.20250306192929-c4e706f12358/go.mod h1:TpRPBEiYJj8ZoVmuDIJS+nJlixRv2fnp/a54uXSWd38=
open-cluster-management.io/sdk-go v0.15.1-0.20241125015855-1536c3970f8f h1:zeC7QrFNarfK2zY6jGtd+mX+yDrQQmnH/J8A7n5Nh38=
open-cluster-management.io/sdk-go v0.15.1-0.20241125015855-1536c3970f8f/go.mod h1:fi5WBsbC5K3txKb8eRLuP0Sim/Oqz/PHX18skAEyjiA=
open-cluster-management.io/ocm v0.15.1-0.20250312033809-a5f3912a6632 h1:WQTYSwv8UT1LMErff8/kTTG49zeKiWcE4pVUn0zIofE=
open-cluster-management.io/ocm v0.15.1-0.20250312033809-a5f3912a6632/go.mod h1:M2/9PVwAYtP2Rv9ahsUEcGGXUctPPVlqhzrBKRW4Wzs=
open-cluster-management.io/sdk-go v0.16.0 h1:Ui1jerkeLaNaJPu47xjOJ3lh+rJQgeJHD25ViQMzAMs=
open-cluster-management.io/sdk-go v0.16.0/go.mod h1:TyOjZC5YxyM5BRNgwTmLuTbHXX6xXqzYBXllrfoVp9w=
oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo=
oras.land/oras-go v1.2.5/go.mod h1:PuAwRShRZCsZb7g8Ar3jKKQR/2A/qN+pkYxIOd/FAoo=
sigs.k8s.io/apiserver-network-proxy v0.29.0 h1:4N+QiVBucLicDSP8V1Izf5h4t8DsKFZ346hA8kQlXDw=
Expand Down
9 changes: 7 additions & 2 deletions pkg/cmd/init/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,14 @@ func (o *Options) run() error {
}

r := reader.NewResourceReader(o.ClusteradmFlags.KubectlFactory, o.ClusteradmFlags.DryRun, o.Streams)
raw, err := chart.RenderClusterManagerChart(
crds, raw, err := chart.RenderClusterManagerChart(
o.clusterManagerChartConfig,
"open-cluster-management")
if err != nil {
return err
}

if err := r.ApplyRaw(raw); err != nil {
if err := r.ApplyRaw(crds); err != nil {
return err
}

Expand All @@ -223,6 +223,11 @@ func (o *Options) run() error {
return err
}
}

if err := r.ApplyRaw(raw); err != nil {
return err
}

if o.wait && !o.ClusteradmFlags.DryRun {
if err := helperwait.WaitUntilRegistrationOperatorReady(
o.Streams.Out,
Expand Down
11 changes: 8 additions & 3 deletions pkg/cmd/join/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ import (
"crypto/x509"
"encoding/pem"
"fmt"
gherrors "github.com/pkg/errors"
"io"
"os"
"reflect"
"strings"
"sync/atomic"
"time"

gherrors "github.com/pkg/errors"

"github.com/ghodss/yaml"
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -386,12 +387,12 @@ func (o *Options) applyKlusterlet(r *reader.ResourceReader, operatorClient opera
o.klusterletChartConfig.NoOperator = true
}

raw, err := chart.RenderKlusterletChart(o.klusterletChartConfig, OperatorNamesapce)
crds, raw, err := chart.RenderKlusterletChart(o.klusterletChartConfig, OperatorNamesapce)
if err != nil {
return err
}

if err := r.ApplyRaw(raw); err != nil {
if err := r.ApplyRaw(crds); err != nil {
return err
}

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

if err := r.ApplyRaw(raw); err != nil {
return err
}

if !available && o.wait && !o.ClusteradmFlags.DryRun {
err = waitUntilRegistrationOperatorConditionIsTrue(
o.Streams.Out, o.ClusteradmFlags.KubectlFactory, int64(o.ClusteradmFlags.Timeout))
Expand Down
9 changes: 7 additions & 2 deletions pkg/cmd/upgrade/clustermanager/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ func (o *Options) run() error {
return err
}

raw, err := chart.RenderClusterManagerChart(
crds, raw, err := chart.RenderClusterManagerChart(
o.clusterManagerChartConfig,
"open-cluster-management")
if err != nil {
return err
}

if err := r.ApplyRaw(raw); err != nil {
if err := r.ApplyRaw(crds); err != nil {
return err
}

Expand All @@ -107,6 +107,11 @@ func (o *Options) run() error {
return err
}
}

if err := r.ApplyRaw(raw); err != nil {
return err
}

if o.wait && !o.ClusteradmFlags.DryRun {
if err := wait.WaitUntilRegistrationOperatorReady(
o.Streams.Out,
Expand Down
9 changes: 7 additions & 2 deletions pkg/cmd/upgrade/klusterlet/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,14 @@ func (o *Options) run() error {
return err
}

raw, err := chart.RenderKlusterletChart(
crds, raw, err := chart.RenderKlusterletChart(
o.klusterletChartConfig,
"open-cluster-management")
if err != nil {
return err
}

if err := r.ApplyRaw(raw); err != nil {
if err := r.ApplyRaw(crds); err != nil {
return err
}

Expand All @@ -123,6 +123,11 @@ func (o *Options) run() error {
return err
}
}

if err := r.ApplyRaw(raw); err != nil {
return err
}

if o.wait && !o.ClusteradmFlags.DryRun {
if err := wait.WaitUntilRegistrationOperatorReady(
o.Streams.Out,
Expand Down
6 changes: 3 additions & 3 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,7 +1245,7 @@ k8s.io/utils/pointer
k8s.io/utils/ptr
k8s.io/utils/strings/slices
k8s.io/utils/trace
# open-cluster-management.io/api v0.15.1-0.20250226073118-8c9793267c9e
# open-cluster-management.io/api v0.16.1
## explicit; go 1.22.0
open-cluster-management.io/api/addon/v1alpha1
open-cluster-management.io/api/client/addon/clientset/versioned
Expand Down Expand Up @@ -1288,12 +1288,12 @@ open-cluster-management.io/managed-serviceaccount/pkg/generated/clientset/versio
open-cluster-management.io/managed-serviceaccount/pkg/generated/clientset/versioned/scheme
open-cluster-management.io/managed-serviceaccount/pkg/generated/clientset/versioned/typed/authentication/v1alpha1
open-cluster-management.io/managed-serviceaccount/pkg/generated/clientset/versioned/typed/authentication/v1beta1
# open-cluster-management.io/ocm v0.15.1-0.20250306192929-c4e706f12358
# open-cluster-management.io/ocm v0.15.1-0.20250312033809-a5f3912a6632
## explicit; go 1.22.5
open-cluster-management.io/ocm/deploy/cluster-manager/chart
open-cluster-management.io/ocm/deploy/klusterlet/chart
open-cluster-management.io/ocm/pkg/operator/helpers/chart
# open-cluster-management.io/sdk-go v0.15.1-0.20241125015855-1536c3970f8f
# open-cluster-management.io/sdk-go v0.16.0
## explicit; go 1.22.0
open-cluster-management.io/sdk-go/pkg/apis/cluster/v1beta1
open-cluster-management.io/sdk-go/pkg/apis/cluster/v1beta2
Expand Down
42 changes: 23 additions & 19 deletions vendor/open-cluster-management.io/ocm/pkg/operator/helpers/chart/render.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.