karpenter service name is configurable for webhook cert now

aws · Feb 9, 2022 · 24f2876 · 24f2876
1 parent b4eed34
commit 24f2876
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/charts/karpenter/templates/configmap-logging.yaml b/charts/karpenter/templates/configmap-logging.yaml
@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: config-logging
+  name: karpenter-config-logging
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "karpenter.labels" . | nindent 4 }}
   {{- with .Values.additionalAnnotations }}
-  annotations:
+  annotations:-
     {{- toYaml . | nindent 4 }}
   {{- end }}
 data:

diff --git a/charts/karpenter/templates/deployment.yaml b/charts/karpenter/templates/deployment.yaml
@@ -61,6 +61,8 @@ spec:
               value: {{ .Values.clusterName }}
             - name: CLUSTER_ENDPOINT
               value: {{ .Values.clusterEndpoint }}
+            - name: KARPENTER_SERVICE
+              value: {{ include "karpenter.fullname" . }}
             - name: SYSTEM_NAMESPACE
               valueFrom:
                 fieldRef:
@@ -103,6 +105,8 @@ spec:
               value: {{ .Values.clusterName }}
             - name: CLUSTER_ENDPOINT
               value: {{ .Values.clusterEndpoint }}
+            - name: KARPENTER_SERVICE
+              value: {{ include "karpenter.fullname" . }}
             - name: SYSTEM_NAMESPACE
               valueFrom:
                 fieldRef:

diff --git a/charts/karpenter/templates/service.yaml b/charts/karpenter/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: karpenter
+  name: {{ include "karpenter.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "karpenter.labels" . | nindent 4 }}

diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go
@@ -16,6 +16,7 @@ package main
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/aws/karpenter/pkg/apis"
 	"github.com/aws/karpenter/pkg/cloudprovider"
@@ -45,8 +46,8 @@ func main() {
 	config := knativeinjection.ParseAndGetRESTConfigOrDie()
 	ctx := webhook.WithOptions(knativeinjection.WithNamespaceScope(signals.NewContext(), system.Namespace()), webhook.Options{
 		Port:        opts.WebhookPort,
-		ServiceName: "karpenter",
-		SecretName:  "karpenter-cert",
+		ServiceName: opts.KarpenterService,
+		SecretName:  fmt.Sprintf("%s-cert", opts.KarpenterService),
 	})
 
 	// Register the cloud provider to attach vendor specific validation logic.

diff --git a/pkg/utils/options/options.go b/pkg/utils/options/options.go
@@ -34,6 +34,7 @@ func MustParse() Options {
 	opts := Options{}
 	flag.StringVar(&opts.ClusterName, "cluster-name", env.WithDefaultString("CLUSTER_NAME", ""), "The kubernetes cluster name for resource discovery")
 	flag.StringVar(&opts.ClusterEndpoint, "cluster-endpoint", env.WithDefaultString("CLUSTER_ENDPOINT", ""), "The external kubernetes cluster endpoint for new nodes to connect with")
+	flag.StringVar(&opts.KarpenterService, "karpenter-service", env.WithDefaultString("KARPENTER_SERVICE", ""), "The Karpenter Service name for the dynamic webhook certificate")
 	flag.IntVar(&opts.MetricsPort, "metrics-port", env.WithDefaultInt("METRICS_PORT", 8080), "The port the metric endpoint binds to for operating metrics about the controller itself")
 	flag.IntVar(&opts.HealthProbePort, "health-probe-port", env.WithDefaultInt("HEALTH_PROBE_PORT", 8081), "The port the health probe endpoint binds to for reporting controller health")
 	flag.IntVar(&opts.WebhookPort, "port", 8443, "The port the webhook endpoint binds to for validation and mutation of resources")
@@ -53,6 +54,7 @@ func MustParse() Options {
 type Options struct {
 	ClusterName               string
 	ClusterEndpoint           string
+	KarpenterService          string
 	MetricsPort               int
 	HealthProbePort           int
 	WebhookPort               int

diff --git a/website/content/en/preview/development-guide.md b/website/content/en/preview/development-guide.md
@@ -56,7 +56,7 @@ make battletest # More rigorous tests run in CI environment
 ### Verbose Logging
 
 ```bash
-kubectl patch configmap config-logging -n karpenter --patch '{"data":{"loglevel.controller":"debug"}}'
+kubectl patch configmap karpenter-config-logging -n karpenter --patch '{"data":{"loglevel.controller":"debug"}}'
 ```
 
 ### Debugging Metrics