Customize api server port

Signed-off-by: Daishan Peng <daishan@acorn.io>
k3s-io · Jun 29, 2023 · 7ca672b · 7ca672b
1 parent 9f2eeec
commit 7ca672b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/pkg/controllers/chart/chart.go b/pkg/controllers/chart/chart.go
@@ -68,10 +68,11 @@ type Controller struct {
 	jobCache        batchcontroller.JobCache
 	apply           apply.Apply
 	recorder        record.EventRecorder
+	apiServerPort   string
 }
 
 func Register(ctx context.Context,
-	systemNamespace, managedBy string,
+	systemNamespace, managedBy, apiServerPort string,
 	k8s kubernetes.Interface,
 	apply apply.Apply,
 	recorder record.EventRecorder,
@@ -96,6 +97,7 @@ func Register(ctx context.Context,
 		jobs:            jobs,
 		jobCache:        jobCache,
 		recorder:        recorder,
+		apiServerPort:   apiServerPort,
 	}
 
 	c.apply = apply.
@@ -309,7 +311,7 @@ func (c *Controller) getJobAndRelatedResources(chart *v1.HelmChart) (*batch.Job,
 	}
 
 	// get the default job and configmaps
-	job, valuesSecret, contentConfigMap := job(chart)
+	job, valuesSecret, contentConfigMap := job(chart, c.apiServerPort)
 
 	// check if a HelmChartConfig is registered for this Helm chart
 	config, err := c.confCache.Get(chart.Namespace, chart.Name)
@@ -340,7 +342,7 @@ func (c *Controller) getJobAndRelatedResources(chart *v1.HelmChart) (*batch.Job,
 	}, nil
 }
 
-func job(chart *v1.HelmChart) (*batch.Job, *corev1.Secret, *corev1.ConfigMap) {
+func job(chart *v1.HelmChart, apiServerPort string) (*batch.Job, *corev1.Secret, *corev1.ConfigMap) {
 	jobImage := strings.TrimSpace(chart.Spec.JobImage)
 	if jobImage == "" {
 		jobImage = DefaultJobImage
@@ -481,7 +483,7 @@ func job(chart *v1.HelmChart) (*batch.Job, *corev1.Secret, *corev1.ConfigMap) {
 				Value: "127.0.0.1"},
 			{
 				Name:  "KUBERNETES_SERVICE_PORT",
-				Value: "6443"},
+				Value: apiServerPort},
 			{
 				Name:  "BOOTSTRAP",
 				Value: "true"},

diff --git a/pkg/controllers/chart/chart_test.go b/pkg/controllers/chart/chart_test.go
@@ -38,7 +38,7 @@ func TestSetVals(t *testing.T) {
 func TestInstallJob(t *testing.T) {
 	assert := assert.New(t)
 	chart := NewChart()
-	job, _, _ := job(chart)
+	job, _, _ := job(chart, "6443")
 	assert.Equal("helm-install-traefik", job.Name)
 	assert.Equal(DefaultJobImage, job.Spec.Template.Spec.Containers[0].Image)
 	assert.Equal("helm-traefik", job.Spec.Template.Spec.ServiceAccountName)
@@ -49,7 +49,7 @@ func TestDeleteJob(t *testing.T) {
 	chart := NewChart()
 	deleteTime := metav1.NewTime(time.Time{})
 	chart.DeletionTimestamp = &deleteTime
-	job, _, _ := job(chart)
+	job, _, _ := job(chart, "6443")
 	assert.Equal("helm-delete-traefik", job.Name)
 }
 

diff --git a/pkg/controllers/controllers.go b/pkg/controllers/controllers.go
@@ -75,6 +75,7 @@ func Register(ctx context.Context, systemNamespace, controllerName string, cfg c
 	chart.Register(ctx,
 		systemNamespace,
 		controllerName,
+		"6443",
 		appCtx.K8s,
 		appCtx.Apply,
 		recorder,