Allow k3s to customize apiServerPort on helm-controller (#7872)

Signed-off-by: Daishan Peng <daishan@acorn.io> Signed-off-by: Derek Nola <derek.nola@suse.com> Co-authored-by: Daishan Peng <daishan@acorn.io>

Allow k3s to customize apiServerPort on helm-controller (#7872)
3f2fda56 · Derek Nola · GitHub · f5597e7a · 3f2fda56 · 3f2fda56
Unverified Commit 3f2fda56 authored Jul 05, 2023 by Derek Nola Committed by GitHub Jul 05, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

go.mod go.mod +1 -1

go.sum go.sum +2 -2

server.go pkg/server/server.go +1 -0

No files found.
--- a/go.mod
+++ b/go.mod
@@ -88,7 +88,7 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.5.0
 	github.com/json-iterator/go v1.1.12
-	github.com/k3s-io/helm-controller v0.15.0
+	github.com/k3s-io/helm-controller v0.15.2
 	github.com/k3s-io/kine v0.10.1
 	github.com/klauspost/compress v1.16.5
 	github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000

--- a/go.sum
+++ b/go.sum
@@ -605,8 +605,8 @@ github.com/k3s-io/etcd/etcdutl/v3 v3.5.3-k3s1 h1:uPCEhACmVoFJnI9Izb2Y+UKRS5JM/F/
 github.com/k3s-io/etcd/etcdutl/v3 v3.5.3-k3s1/go.mod h1:F9bW3+f+cKZIcjWHkdfJ3lnCajF4FnPh7DjcgiBRb7g=
 github.com/k3s-io/etcd/server/v3 v3.5.3-k3s1 h1:MVTrb5cp75kSMA9K240VMa5I+GKuYYP9xN/Nj+US27w=
 github.com/k3s-io/etcd/server/v3 v3.5.3-k3s1/go.mod h1:xwZlQLuAWsWw5rpb/Gwzi3nFie9STKcrKQbM6evLi5g=
-github.com/k3s-io/helm-controller v0.15.0 h1:ZKpgkq4TX/EAebCoJhPfGRF7w1F8Kz1Kb4ugbkKZoic=
-github.com/k3s-io/helm-controller v0.15.0/go.mod h1:BgCPBQblj/Ect4Q7/Umf86WvyDjdG/34D+n8wfXtoeM=
+github.com/k3s-io/helm-controller v0.15.2 h1:H5OWiNPhp9ZoyZOldt0ewq7wTy4UnU9j7DHdb7swi0Q=
+github.com/k3s-io/helm-controller v0.15.2/go.mod h1:BgCPBQblj/Ect4Q7/Umf86WvyDjdG/34D+n8wfXtoeM=
 github.com/k3s-io/kine v0.10.1 h1:HdpG84WaZvIYYzFB+kT8grNhtlsGzLLYN/MohV+r7+U=
 github.com/k3s-io/kine v0.10.1/go.mod h1:TU8mr4oByeEPKChQBUpSdGc1mZk+Txr2yZhRY+Jch1Q=
 github.com/k3s-io/klog v1.0.0-k3s2 h1:yyvD2bQbxG7m85/pvNctLX2bUDmva5kOBvuZ77tTGBA=

--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -232,6 +232,7 @@ func coreControllers(ctx context.Context, sc *Context, config *Config) error {
 		helmchart.Register(ctx,
 			metav1.NamespaceAll,
 			helmcommon.Name,
+			strconv.Itoa(config.ControlConfig.APIServerPort),
 			k8s,
 			apply,
 			util.BuildControllerEventRecorder(k8s, helmcommon.Name, metav1.NamespaceAll),