From e1a315189b58a305fb1ea11ea9c9fe5d82403b19 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Wed, 5 Jul 2023 11:56:58 -0700 Subject: [PATCH] Allow k3s to customize apiServerPort on helm-controller (#7873) Signed-off-by: Daishan Peng Co-authored-by: Daishan Peng --- go.mod | 2 +- go.sum | 4 ++-- pkg/server/server.go | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 349a46c4c09b..5cbc24be17b1 100644 --- a/go.mod +++ b/go.mod @@ -89,7 +89,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 diff --git a/go.sum b/go.sum index 82c62def2f08..4171c224f3e3 100644 --- a/go.sum +++ b/go.sum @@ -608,8 +608,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= diff --git a/pkg/server/server.go b/pkg/server/server.go index 722a2523719a..ab549c232359 100644 --- 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),