Skip to content

Commit

Permalink
fix: Template v1 and Conversion CRD stanzas v0.37.x (aws#7237)
Browse files Browse the repository at this point in the history
  • Loading branch information
rschalo committed Oct 28, 2024
1 parent 7adb8a5 commit 0b44aee
Show file tree
Hide file tree
Showing 8 changed files with 97 additions and 49 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ spec:
singular: ec2nodeclass
scope: Cluster
versions:
{{- if .Values.webhook.enabled }}
- additionalPrinterColumns:
- jsonPath: .status.conditions[?(@.type=="Ready")].status
name: Ready
Expand Down Expand Up @@ -735,6 +736,7 @@ spec:
storage: false
subresources:
status: {}
{{- end }}
- name: v1beta1
schema:
openAPIV3Schema:
Expand Down
2 changes: 2 additions & 0 deletions charts/karpenter-crd/templates/karpenter.sh_nodeclaims.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ spec:
singular: nodeclaim
scope: Cluster
versions:
{{- if .Values.webhook.enabled }}
- additionalPrinterColumns:
- jsonPath: .metadata.labels.node\.kubernetes\.io/instance-type
name: Type
Expand Down Expand Up @@ -379,6 +380,7 @@ spec:
storage: false
subresources:
status: {}
{{- end }}
- additionalPrinterColumns:
- jsonPath: .metadata.labels.node\.kubernetes\.io/instance-type
name: Type
Expand Down
2 changes: 2 additions & 0 deletions charts/karpenter-crd/templates/karpenter.sh_nodepools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ spec:
singular: nodepool
scope: Cluster
versions:
{{- if .Values.webhook.enabled }}
- additionalPrinterColumns:
- jsonPath: .spec.template.spec.nodeClassRef.name
name: NodeClass
Expand Down Expand Up @@ -502,6 +503,7 @@ spec:
storage: false
subresources:
status: {}
{{- end }}
- additionalPrinterColumns:
- jsonPath: .spec.template.spec.nodeClassRef.name
name: NodeClass
Expand Down
52 changes: 5 additions & 47 deletions hack/mutation/conversion_webhook_injection.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,54 +6,12 @@ yq eval '.spec.conversion = {"strategy": "Webhook", "webhook": {"conversionRevie
yq eval '.spec.conversion = {"strategy": "Webhook", "webhook": {"conversionReviewVersions": ["v1beta1", "v1"], "clientConfig": {"service": {"name": "karpenter", "namespace": "kube-system", "port": 8443}}}}' -i pkg/apis/crds/karpenter.sh_nodepools.yaml

# Update to the karpenter-crd charts

# Remove the copied over conversion stanzas from CRD spec
# Remove the copied conversion stanzas from CRD specs
yq eval 'del(.spec.conversion)' -i charts/karpenter-crd/templates/karpenter.k8s.aws_ec2nodeclasses.yaml
yq eval 'del(.spec.conversion)' -i charts/karpenter-crd/templates/karpenter.sh_nodeclaims.yaml
yq eval 'del(.spec.conversion)' -i charts/karpenter-crd/templates/karpenter.sh_nodepools.yaml

# Add the conversion stanza template to the CRD spec to enable conversion via webhook
echo "{{- if .Values.webhook.enabled }}
conversion:
strategy: Webhook
webhook:
conversionReviewVersions:
- v1beta1
- v1
clientConfig:
service:
name: {{ .Values.webhook.serviceName }}
namespace: {{ .Values.webhook.serviceNamespace | default .Release.Namespace }}
port: {{ .Values.webhook.port }}
{{- end }}
" >> charts/karpenter-crd/templates/karpenter.sh_nodepools.yaml

echo "{{- if .Values.webhook.enabled }}
conversion:
strategy: Webhook
webhook:
conversionReviewVersions:
- v1beta1
- v1
clientConfig:
service:
name: {{ .Values.webhook.serviceName }}
namespace: {{ .Values.webhook.serviceNamespace | default .Release.Namespace }}
port: {{ .Values.webhook.port }}
{{- end }}
" >> charts/karpenter-crd/templates/karpenter.sh_nodeclaims.yaml

echo "{{- if .Values.webhook.enabled }}
conversion:
strategy: Webhook
webhook:
conversionReviewVersions:
- v1beta1
- v1
clientConfig:
service:
name: {{ .Values.webhook.serviceName }}
namespace: {{ .Values.webhook.serviceNamespace | default .Release.Namespace }}
port: {{ .Values.webhook.port }}
{{- end }}
" >> charts/karpenter-crd/templates/karpenter.k8s.aws_ec2nodeclasses.yaml
# Template the v1 version and the conversion strategy of the spec
hack/mutation/ec2nodeclasses.sh
hack/mutation/nodepools.sh
hack/mutation/nodeclaims.sh
26 changes: 26 additions & 0 deletions hack/mutation/ec2nodeclasses.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/usr/bin/env bash

VERSION_START="$(cat charts/karpenter-crd/templates/karpenter.k8s.aws_ec2nodeclasses.yaml | yq '.spec.versions.[0] | line')"
VERSION_END="$(cat charts/karpenter-crd/templates/karpenter.k8s.aws_ec2nodeclasses.yaml | yq '.spec.versions.[1] | line')"
VERSION_END=$(($VERSION_END+1))
TEMP=$(mktemp)

cat charts/karpenter-crd/templates/karpenter.k8s.aws_ec2nodeclasses.yaml | awk -v n=$VERSION_START 'NR==n {sub(/$/,"\n{{- if .Values.webhook.enabled }}")} 1' \
| awk -v n=$VERSION_END 'NR==n {sub(/$/,"\n{{- end }}")} 1' > $TEMP

cat $TEMP > charts/karpenter-crd/templates/karpenter.k8s.aws_ec2nodeclasses.yaml

echo "{{- if .Values.webhook.enabled }}
conversion:
strategy: Webhook
webhook:
conversionReviewVersions:
- v1beta1
- v1
clientConfig:
service:
name: {{ .Values.webhook.serviceName }}
namespace: {{ .Values.webhook.serviceNamespace | default .Release.Namespace }}
port: {{ .Values.webhook.port }}
{{- end }}
" >> charts/karpenter-crd/templates/karpenter.k8s.aws_ec2nodeclasses.yaml
26 changes: 26 additions & 0 deletions hack/mutation/nodeclaims.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/usr/bin/env bash

VERSION_START="$(cat charts/karpenter-crd/templates/karpenter.sh_nodeclaims.yaml | yq '.spec.versions.[0] | line')"
VERSION_END="$(cat charts/karpenter-crd/templates/karpenter.sh_nodeclaims.yaml | yq '.spec.versions.[1] | line')"
VERSION_END=$(($VERSION_END+1))
TEMP=$(mktemp)

cat charts/karpenter-crd/templates/karpenter.sh_nodeclaims.yaml | awk -v n=$VERSION_START 'NR==n {sub(/$/,"\n{{- if .Values.webhook.enabled }}")} 1' \
| awk -v n=$VERSION_END 'NR==n {sub(/$/,"\n{{- end }}")} 1' > $TEMP

cat $TEMP > charts/karpenter-crd/templates/karpenter.sh_nodeclaims.yaml

echo "{{- if .Values.webhook.enabled }}
conversion:
strategy: Webhook
webhook:
conversionReviewVersions:
- v1beta1
- v1
clientConfig:
service:
name: {{ .Values.webhook.serviceName }}
namespace: {{ .Values.webhook.serviceNamespace | default .Release.Namespace }}
port: {{ .Values.webhook.port }}
{{- end }}
" >> charts/karpenter-crd/templates/karpenter.sh_nodeclaims.yaml
26 changes: 26 additions & 0 deletions hack/mutation/nodepools.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/usr/bin/env bash

VERSION_START="$(cat charts/karpenter-crd/templates/karpenter.sh_nodepools.yaml | yq '.spec.versions.[0] | line')"
VERSION_END="$(cat charts/karpenter-crd/templates/karpenter.sh_nodepools.yaml | yq '.spec.versions.[1] | line')"
VERSION_END=$(($VERSION_END+1))
TEMP=$(mktemp)

cat charts/karpenter-crd/templates/karpenter.sh_nodepools.yaml | awk -v n=$VERSION_START 'NR==n {sub(/$/,"\n{{- if .Values.webhook.enabled }}")} 1' \
| awk -v n=$VERSION_END 'NR==n {sub(/$/,"\n{{- end }}")} 1' > $TEMP

cat $TEMP > charts/karpenter-crd/templates/karpenter.sh_nodepools.yaml

echo "{{- if .Values.webhook.enabled }}
conversion:
strategy: Webhook
webhook:
conversionReviewVersions:
- v1beta1
- v1
clientConfig:
service:
name: {{ .Values.webhook.serviceName }}
namespace: {{ .Values.webhook.serviceNamespace | default .Release.Namespace }}
port: {{ .Values.webhook.port }}
{{- end }}
" >> charts/karpenter-crd/templates/karpenter.sh_nodepools.yaml
10 changes: 8 additions & 2 deletions test/hack/e2e_scripts/install_karpenter.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
aws eks update-kubeconfig --name "$CLUSTER_NAME"

# Parse minor version to determine whether to enable the webhooks
K8S_VERSION_MINOR="${K8S_VERSION#*.}"
# First, conditionally install the webhook stanza and CRDs
if (( "$WEBHOOKS_ENABLED" == 'false' )); then
helm upgrade --install karpenter-crd oci://public.ecr.aws/karpenter/karpenter-crd \
--namespace kube-system \
--version $(git describe --tags --abbrev=0 | cut -c 2-) \
--set webhook.enabled=${WEBHOOKS_ENABLED} \
--wait
fi

CHART="oci://$ECR_ACCOUNT_ID.dkr.ecr.$ECR_REGION.amazonaws.com/karpenter/snapshot/karpenter"
ADDITIONAL_FLAGS=""
Expand Down

0 comments on commit 0b44aee

Please sign in to comment.