Skip to content

Commit

Permalink
Chart update
Browse files Browse the repository at this point in the history 
Signed-off-by: Jian Qiu <[email protected]>
  • Loading branch information
@qiujian16
qiujian16 committed Aug 29, 2024
1 parent 5f39e3d commit 96e079b
Show file tree
Hide file tree
Showing 19 changed files with 98 additions and 123 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ require (
open-cluster-management.io/api v0.14.1-0.20240627145512-bd6f2229b53c
open-cluster-management.io/cluster-proxy v0.4.0
open-cluster-management.io/managed-serviceaccount v0.6.0
open-cluster-management.io/ocm v0.14.1-0.20240819063207-0536c757af31
open-cluster-management.io/ocm v0.14.1-0.20240829031425-567a9a4e188c
open-cluster-management.io/sdk-go v0.14.1-0.20240628095929-9ffb1b19e566
sigs.k8s.io/apiserver-network-proxy v0.29.0
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -577,8 +577,8 @@ open-cluster-management.io/cluster-proxy v0.4.0 h1:rm0UDaDWe3/P3xLzwqdHtqNksKwSz
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.14.1-0.20240819063207-0536c757af31 h1:on+ek8B5821n8VlDKKk8+FnQMbiJl0WVBV8QDuvPWqI=
open-cluster-management.io/ocm v0.14.1-0.20240819063207-0536c757af31/go.mod h1:KWsyZ9g9AyPcgwi8x+8g+LFJQ9oHNIRfsP5YI/npKFA=
open-cluster-management.io/ocm v0.14.1-0.20240829031425-567a9a4e188c h1:j2exRpAeji0qZispaOnSHsq6VhX8XHbIGS8F4djNw4E=
open-cluster-management.io/ocm v0.14.1-0.20240829031425-567a9a4e188c/go.mod h1:KWsyZ9g9AyPcgwi8x+8g+LFJQ9oHNIRfsP5YI/npKFA=
open-cluster-management.io/sdk-go v0.14.1-0.20240628095929-9ffb1b19e566 h1:8dgPiM3byX/rtOrFJIsea2haV4hSFTND65Tlj1EdK18=
open-cluster-management.io/sdk-go v0.14.1-0.20240628095929-9ffb1b19e566/go.mod h1:xFmN3Db5nN68oLGnstmIRv4us8HJCdXFnBNMXVp0jWY=
oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo=
Expand Down
26 changes: 7 additions & 19 deletions pkg/cmd/init/exec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
ocmfeature "open-cluster-management.io/api/feature"
operatorv1 "open-cluster-management.io/api/operator/v1"
"open-cluster-management.io/clusteradm/pkg/cmd/init/preflight"
"open-cluster-management.io/clusteradm/pkg/cmd/init/scenario"
genericclioptionsclusteradm "open-cluster-management.io/clusteradm/pkg/genericclioptions"
"open-cluster-management.io/clusteradm/pkg/helpers"
"open-cluster-management.io/clusteradm/pkg/helpers/helm"
Expand Down Expand Up @@ -161,32 +160,21 @@ func (o *Options) run() error {
return err
}
} else {
files := []string{}
if o.createNamespace {
files = append(files, "init/namespace.yaml")
} else {
o.clusterManagerChartConfig.CreateNamespace = o.createNamespace
if !o.createNamespace {
fmt.Fprintf(o.Streams.Out, "skip creating namespace\n")
}

if !o.useBootstrapToken {
files = append(files,
"init/bootstrap_sa.yaml",
"init/bootstrap_cluster_role.yaml",
"init/bootstrap_sa_cluster_role_binding.yaml",
)
o.clusterManagerChartConfig.CreateBootstrapSA = true
} else {
o.clusterManagerChartConfig.CreateBootstrapToken = true
}

r := reader.NewResourceReader(o.ClusteradmFlags.KubectlFactory, o.ClusteradmFlags.DryRun, o.Streams)
err = r.Apply(scenario.Files, nil, files...)
if err != nil {
return err
}

raw, err := chart.RenderChart[*clustermanagerchart.ChartConfig](
raw, err := chart.RenderClusterManagerChart(
o.clusterManagerChartConfig,
"open-cluster-management",
"cluster-manager",
clustermanagerchart.ChartFiles)
"open-cluster-management")
if err != nil {
return err
}
Expand Down
36 changes: 0 additions & 36 deletions pkg/cmd/init/scenario/init/bootstrap_cluster_role.yaml
View file

This file was deleted.

6 changes: 0 additions & 6 deletions pkg/cmd/init/scenario/init/bootstrap_sa.yaml
View file

This file was deleted.

5 changes: 0 additions & 5 deletions pkg/cmd/init/scenario/init/namespace.yaml
View file

This file was deleted.

22 changes: 0 additions & 22 deletions pkg/cmd/init/scenario/resources.go
View file

This file was deleted.

17 changes: 3 additions & 14 deletions pkg/cmd/join/exec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import (
ocmfeature "open-cluster-management.io/api/feature"
operatorv1 "open-cluster-management.io/api/operator/v1"
"open-cluster-management.io/clusteradm/pkg/cmd/join/preflight"
"open-cluster-management.io/clusteradm/pkg/cmd/join/scenario"
genericclioptionsclusteradm "open-cluster-management.io/clusteradm/pkg/genericclioptions"
"open-cluster-management.io/clusteradm/pkg/helpers"
preflightinterface "open-cluster-management.io/clusteradm/pkg/helpers/preflight"
Expand Down Expand Up @@ -356,21 +355,11 @@ func (o *Options) applyKlusterlet(r *reader.ResourceReader, operatorClient opera

// If Deployment/klusterlet is not deployed, deploy it
if !available {
var files []string
if o.createNameSpace {
files = append(files, "join/namespace.yaml")
}

err = r.Apply(scenario.Files, nil, files...)
if err != nil {
return err
}
o.klusterletChartConfig.CreateNamespace = o.createNameSpace

raw, err := chart.RenderChart[*klusterletchart.ChartConfig](
raw, err := chart.RenderKlusterletChart(
o.klusterletChartConfig,
"open-cluster-management",
"klusterlet",
klusterletchart.ChartFiles)
"open-cluster-management")
if err != nil {
return err
}
Expand Down
6 changes: 2 additions & 4 deletions pkg/cmd/upgrade/clustermanager/exec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,9 @@ func (o *Options) run() error {
return err
}

raw, err := chart.RenderChart[*clustermanagerchart.ChartConfig](
raw, err := chart.RenderClusterManagerChart(
o.clusterManagerChartConfig,
"open-cluster-management",
"cluster-manager",
clustermanagerchart.ChartFiles)
"open-cluster-management")
if err != nil {
return err
}
Expand Down
7 changes: 2 additions & 5 deletions pkg/cmd/upgrade/klusterlet/exec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"open-cluster-management.io/clusteradm/pkg/helpers"
"open-cluster-management.io/clusteradm/pkg/helpers/reader"
"open-cluster-management.io/clusteradm/pkg/helpers/wait"
klusterletchart "open-cluster-management.io/ocm/deploy/klusterlet/chart"
"open-cluster-management.io/ocm/pkg/operator/helpers/chart"
)

Expand Down Expand Up @@ -87,11 +86,9 @@ func (o *Options) run() error {
return err
}

raw, err := chart.RenderChart[*klusterletchart.ChartConfig](
raw, err := chart.RenderKlusterletChart(
o.klusterletChartConfig,
"open-cluster-management",
"klusterlet",
klusterletchart.ChartFiles)
"open-cluster-management")
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1261,7 +1261,7 @@ 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.14.1-0.20240819063207-0536c757af31
# open-cluster-management.io/ocm v0.14.1-0.20240829031425-567a9a4e188c
## explicit; go 1.22.6
open-cluster-management.io/ocm/deploy/cluster-manager/chart
open-cluster-management.io/ocm/deploy/klusterlet/chart
Expand Down
2 changes: 1 addition & 1 deletion ...io/ocm/deploy/cluster-manager/chart/cluster-manager/templates/bootstrap_cluster_role.yaml
View file

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

7 changes: 7 additions & 0 deletions ...anagement.io/ocm/deploy/cluster-manager/chart/cluster-manager/templates/bootstrap_sa.yaml
View file

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

5 changes: 3 additions & 2 deletions ...it/bootstrap_sa_cluster_role_binding.yaml → ...es/bootstrap_sa_cluster_role_binding.yaml
View file

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

2 changes: 1 addition & 1 deletion ...gement.io/ocm/deploy/cluster-manager/chart/cluster-manager/templates/cluster_manager.yaml
View file

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

3 changes: 3 additions & 0 deletions ...r/open-cluster-management.io/ocm/deploy/cluster-manager/chart/cluster-manager/values.yaml
View file

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

4 changes: 4 additions & 0 deletions vendor/open-cluster-management.io/ocm/deploy/cluster-manager/chart/config.go
View file

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

2 changes: 2 additions & 0 deletions vendor/open-cluster-management.io/ocm/deploy/klusterlet/chart/config.go
View file

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

63 changes: 59 additions & 4 deletions vendor/open-cluster-management.io/ocm/pkg/operator/helpers/chart/render.go
View file

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

0 comments on commit 96e079b

Please sign in to comment.