Skip to content

Commit

Permalink
Avoid create namespace option (#28)
Browse files Browse the repository at this point in the history 
Signed-off-by: Tamal Saha <[email protected]>
  • Loading branch information
@tamalsaha
tamalsaha authored Apr 3, 2024
1 parent 28fccba commit af88b1f
Show file tree
Hide file tree
Showing 28 changed files with 331 additions and 2,378 deletions.
4 changes: 1 addition & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ module go.bytebuilders.dev/license-proxyserver

go 1.22.0

replace open-cluster-management.io/addon-framework => github.com/kluster-manager/addon-framework v0.9.1-0.20240311172228-479bd0233527

require (
github.com/google/gofuzz v1.2.0
github.com/pkg/errors v0.9.1
Expand All @@ -26,7 +24,7 @@ require (
k8s.io/kube-openapi v0.0.0-20231129212854-f0671cc7e66a
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
kmodules.xyz/client-go v0.29.10
open-cluster-management.io/addon-framework v0.9.0
open-cluster-management.io/addon-framework v0.9.1-0.20240402013859-be542a6d0a9c
open-cluster-management.io/api v0.13.0
sigs.k8s.io/controller-runtime v0.17.2
sigs.k8s.io/yaml v1.4.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 @@ -554,8 +554,6 @@ github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs
github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4=
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
github.com/kluster-manager/addon-framework v0.9.1-0.20240311172228-479bd0233527 h1:8ypmznHQOO3l2vLU3Q+zS2VTvLFG6stAmu+z+swTCdA=
github.com/kluster-manager/addon-framework v0.9.1-0.20240311172228-479bd0233527/go.mod h1:nQMHHshMfMNj4qdwg/4oMqRf42FQU6EYy68o2HsLgn4=
github.com/kmodules/apiserver v0.29.1-0.20240104121741-1fb217d4a573 h1:6v7bTFGH/Ha1idq1sLX9px2KJhcx6cpuMowuYRyCht4=
github.com/kmodules/apiserver v0.29.1-0.20240104121741-1fb217d4a573/go.mod h1:31n78PsRKPmfpee7/l9NYEv67u6hOL6AfcE761HapDM=
github.com/kmodules/controller-runtime v0.17.2-0.20240213085617-b6aac9684c00 h1:+2add9izgyGZb+ZOkMwPH/fswvgfIxWilUatbp2nPo8=
Expand Down Expand Up @@ -1447,6 +1445,8 @@ k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt
kmodules.xyz/client-go v0.29.10 h1:vmbKaQ0CEOls4Ta8VjUxlcnvBhTzuhc5QAfGb9pAECM=
kmodules.xyz/client-go v0.29.10/go.mod h1:WYM/ZC3I5/AUGHYyYYEzYHFhnSwK+tEZyGld6KpLoxI=
nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
open-cluster-management.io/addon-framework v0.9.1-0.20240402013859-be542a6d0a9c h1:0CZbptuATWUgJXFHEkfEk2/88POzrbnhhjMi3/39FQ4=
open-cluster-management.io/addon-framework v0.9.1-0.20240402013859-be542a6d0a9c/go.mod h1:nQMHHshMfMNj4qdwg/4oMqRf42FQU6EYy68o2HsLgn4=
open-cluster-management.io/api v0.13.0 h1:dlcJEZlNlE0DmSDctK2s7iWKg9l+Tgb0V78Z040nMuk=
open-cluster-management.io/api v0.13.0/go.mod h1:CuCPEzXDvOyxBB0H1d1eSeajbHqaeGEKq9c63vQc63w=
open-cluster-management.io/sdk-go v0.13.0 h1:ddMGsPUekQr9z03tVN6vF39Uf+WEKMtGU/xSd81HdoA=
Expand Down
9 changes: 5 additions & 4 deletions pkg/manager/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ func NewRegistrationOption(kubeConfig *rest.Config, addonName, agentName string)
CSRConfigurations: agent.KubeClientSignerConfigurations(addonName, agentName),
CSRApproveCheck: agent.ApprovalAllCSRs,
PermissionConfig: rbac.SetupPermission(kubeConfig, agentName),
AgentInstallNamespace: func(addon *v1alpha1.ManagedClusterAddOn) string {
return common.AddonInstallationNamespace
AgentInstallNamespace: func(addon *v1alpha1.ManagedClusterAddOn) (string, error) {
return common.AddonInstallationNamespace, nil
},
}
}
Expand Down Expand Up @@ -135,8 +135,9 @@ func runManagerController(ctx context.Context, cfg *rest.Config, opts *ManagerOp
WithGetValuesFuncs(GetConfigValues(opts, cs)).
WithAgentRegistrationOption(registrationOption).
WithAgentHealthProber(agentHealthProber()).
WithAgentInstallNamespace(func(addon *v1alpha1.ManagedClusterAddOn) string { return common.AddonInstallationNamespace }).
WithCreateAgentInstallNamespace().
WithAgentInstallNamespace(func(addon *v1alpha1.ManagedClusterAddOn) (string, error) {
return common.AddonInstallationNamespace, nil
}).
BuildHelmAgentAddon()
if err != nil {
klog.Errorf("Failed to build agent: `%v`", err)
Expand Down
12 changes: 3 additions & 9 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1423,25 +1423,22 @@ kmodules.xyz/client-go/meta
kmodules.xyz/client-go/openapi
kmodules.xyz/client-go/tools/clientcmd
kmodules.xyz/client-go/tools/clusterid
# open-cluster-management.io/addon-framework v0.9.0 => github.com/kluster-manager/addon-framework v0.9.1-0.20240311172228-479bd0233527
# open-cluster-management.io/addon-framework v0.9.1-0.20240402013859-be542a6d0a9c
## explicit; go 1.21
open-cluster-management.io/addon-framework/pkg/addonfactory
open-cluster-management.io/addon-framework/pkg/addonmanager
open-cluster-management.io/addon-framework/pkg/addonmanager/constants
open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/addonconfig
open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/addoninstall
open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/agentdeploy
open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/certificate
open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/managementaddon
open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/managementaddonconfig
open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/cmaconfig
open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/cmamanagedby
open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/registration
open-cluster-management.io/addon-framework/pkg/agent
open-cluster-management.io/addon-framework/pkg/assets
open-cluster-management.io/addon-framework/pkg/basecontroller/factory
open-cluster-management.io/addon-framework/pkg/cmd/factory
open-cluster-management.io/addon-framework/pkg/index
open-cluster-management.io/addon-framework/pkg/manager/controllers/addonconfiguration
open-cluster-management.io/addon-framework/pkg/manager/controllers/addonowner
open-cluster-management.io/addon-framework/pkg/utils
# open-cluster-management.io/api v0.13.0
## explicit; go 1.21
Expand Down Expand Up @@ -1492,8 +1489,6 @@ open-cluster-management.io/api/work/v1
open-cluster-management.io/api/work/v1alpha1
# open-cluster-management.io/sdk-go v0.13.0
## explicit; go 1.21
open-cluster-management.io/sdk-go/pkg/apis/cluster/v1alpha1
open-cluster-management.io/sdk-go/pkg/apis/cluster/v1beta1
open-cluster-management.io/sdk-go/pkg/apis/work/v1/applier
open-cluster-management.io/sdk-go/pkg/apis/work/v1/builder
open-cluster-management.io/sdk-go/pkg/patcher
Expand Down Expand Up @@ -1645,7 +1640,6 @@ sigs.k8s.io/structured-merge-diff/v4/value
## explicit; go 1.12
sigs.k8s.io/yaml
sigs.k8s.io/yaml/goyaml.v2
# open-cluster-management.io/addon-framework => github.com/kluster-manager/addon-framework v0.9.1-0.20240311172228-479bd0233527
# github.com/Masterminds/sprig/v3 => github.com/gomodules/sprig/v3 v3.2.3-0.20220405051441-0a8a99bac1b8
# sigs.k8s.io/controller-runtime => github.com/kmodules/controller-runtime v0.17.2-0.20240213085617-b6aac9684c00
# github.com/imdario/mergo => github.com/imdario/mergo v0.3.6
Expand Down
58 changes: 28 additions & 30 deletions vendor/open-cluster-management.io/addon-framework/pkg/addonfactory/addonfactory.go
View file

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

Loading

0 comments on commit af88b1f

Please sign in to comment.