Merge branch 'main' into validationcontroller

Author: edibble21

.gitignore

@@ -14,3 +14,6 @@ go.work.sum
 
 # Project Specific
 *.csv
+
+# Binary output
+karpenter-provider-aws-*

Makefile

@@ -34,6 +34,10 @@ KARPENTER_CORE_DIR = $(shell go list -m -f '{{ .Dir }}' sigs.k8s.io/karpenter)
 # TEST_SUITE enables you to select a specific test suite directory to run "make e2etests" against
 TEST_SUITE ?= "..."
 
+# Filename when building the binary controller only
+GOARCH ?= $(shell go env GOARCH)
+BINARY_FILENAME = karpenter-provider-aws-$(GOARCH)
+
 help: ## Display help
 	@awk 'BEGIN {FS = ":.*##"; printf "Usage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
 
@@ -132,6 +136,9 @@ image: ## Build the Karpenter controller images using ko build
 	$(eval IMG_TAG=$(shell echo $(CONTROLLER_IMG) | cut -d "@" -f 1 | cut -d ":" -f 2 -s))
 	$(eval IMG_DIGEST=$(shell echo $(CONTROLLER_IMG) | cut -d "@" -f 2))
 
+binary: ## Build the Karpenter controller binary using go build
+	go build $(GOFLAGS) -o $(BINARY_FILENAME) ./cmd/controller/...
+
 apply: verify image ## Deploy the controller from the current state of your git repository into your ~/.kube/config cluster
 	kubectl apply -f ./pkg/apis/crds/
 	helm upgrade --install karpenter charts/karpenter --namespace ${KARPENTER_NAMESPACE} \

charts/karpenter/templates/_helpers.tpl

@@ -75,6 +75,12 @@ Karpenter image to use
 {{- end }}
 {{- end }}
 
+{{/*
+Karpenter controller container name
+*/}}
+{{- define "karpenter.controller.containerName" -}}
+{{- .Values.controller.containerName | default "controller" -}}
+{{- end -}}
 
 {{/* Get PodDisruptionBudget API Version */}}
 {{- define "karpenter.pdb.apiVersion" -}}

charts/karpenter/templates/deployment.yaml

@@ -60,7 +60,7 @@ spec:
       schedulerName: {{ . | quote }}
       {{- end }}
       containers:
-        - name: {{ .Values.controller.containerName | default "controller" }}
+        - name: {{ include "karpenter.controller.containerName" . }}
           securityContext:
             runAsUser: 65532
             runAsGroup: 65532
@@ -102,7 +102,7 @@ spec:
             - name: MEMORY_LIMIT
               valueFrom:
                 resourceFieldRef:
-                  containerName: controller
+                  containerName: {{ include "karpenter.controller.containerName" . }}
                   divisor: "0"
                   resource: limits.memory
             - name: FEATURE_GATES
@@ -183,16 +183,16 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
         {{- end }}
-        {{- with .Values.controller.sidecarContainer }}
-          {{- toYaml . | nindent 8 }}
-        {{- end }}
-        {{- if and (.Values.controller.sidecarContainer) (or .Values.controller.extraVolumeMounts .Values.controller.sidecarVolumeMounts) }}
+        {{- range .Values.controller.sidecarContainer }}
+        - {{- toYaml . | nindent 10 }}
+        {{- if or $.Values.controller.extraVolumeMounts $.Values.controller.sidecarVolumeMounts }}
           volumeMounts:
-          {{- with .Values.controller.extraVolumeMounts }}
+            {{- with $.Values.controller.extraVolumeMounts }}
             {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- with .Values.controller.sidecarVolumeMounts }}
+            {{- end }}
+            {{- with $.Values.controller.sidecarVolumeMounts }}
             {{- toYaml . | nindent 12 }}
+            {{- end }}
           {{- end }}
         {{- end }}
       {{- with .Values.nodeSelector }}

website/content/en/docs/concepts/nodeclasses.md

@@ -817,7 +817,7 @@ Select by name and owner:
     - name: my-ami
       owner: self
     - name: my-ami
-      owner: 0123456789
+      owner: "0123456789"
 ```
 
 Select by name using a wildcard:

website/content/en/preview/concepts/nodeclasses.md

@@ -817,7 +817,7 @@ Select by name and owner:
     - name: my-ami
       owner: self
     - name: my-ami
-      owner: 0123456789
+      owner: "0123456789"
 ```
 
 Select by name using a wildcard:

website/content/en/v0.32/concepts/nodeclasses.md

@@ -459,7 +459,7 @@ Select by name and owner:
     - name: my-ami
       owner: self
     - name: my-ami
-      owner: 0123456789
+      owner: "0123456789"
 ```
 
 Select by name using a wildcard:

website/content/en/v0.32/upgrading/v1beta1-migration.md

@@ -703,9 +703,9 @@ kind: EC2NodeClass
 spec:
   amiSelectorTerms:
   - name: my-name1
-    owner: 123456789
+    owner: "123456789"
   - name: my-name2
-    owner: 123456789
+    owner: "123456789"
   - name: my-name1
     owner: amazon
   - name: my-name2

website/content/en/v1.0/concepts/nodeclasses.md

@@ -818,7 +818,7 @@ Select by name and owner:
     - name: my-ami
       owner: self
     - name: my-ami
-      owner: 0123456789
+      owner: "0123456789"
 ```
 
 Select by name using a wildcard:

website/content/en/v1.1/concepts/nodeclasses.md

@@ -817,7 +817,7 @@ Select by name and owner:
     - name: my-ami
       owner: self
     - name: my-ami
-      owner: 0123456789
+      owner: "0123456789"
 ```
 
 Select by name using a wildcard:

website/content/en/v1.2/concepts/nodeclasses.md

@@ -817,7 +817,7 @@ Select by name and owner:
     - name: my-ami
       owner: self
     - name: my-ami
-      owner: 0123456789
+      owner: "0123456789"
 ```
 
 Select by name using a wildcard: