feat(karpenter): fix template

kubernetes · May 3, 2023 · dc063ba · dc063ba
1 parent e3109be
commit dc063ba
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 75 deletions.
diff --git a/.../update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/.../update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -69,7 +69,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.19
     manifest: karpenter.sh/k8s-1.19.yaml
-    manifestHash: 2350a3713a7963065426df13fb36b25a5ecd3c71c91c728420e5ebca39193c34
+    manifestHash: a7fcafe317acf63b525620c1299ef21ec61eac5b8f259c8031542fe5968ac483
     name: karpenter.sh
     prune:
       kinds:

diff --git a/...ter/karpenter/data/aws_s3_object_minimal.example.com-addons-karpenter.sh-k8s-1.19_content b/...ter/karpenter/data/aws_s3_object_minimal.example.com-addons-karpenter.sh-k8s-1.19_content
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.2
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   labels:
     addon.kops.k8s.io/name: karpenter.sh
@@ -382,7 +382,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.2
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   labels:
     addon.kops.k8s.io/name: karpenter.sh
@@ -714,7 +714,7 @@ data:
   aws.defaultInstanceProfile: ""
   aws.enableENILimitedPodDensity: "true"
   aws.enablePodENI: "false"
-  aws.interruptionQueue: "false"
+  aws.interruptionQueueName: ""
   aws.isolatedVPC: "false"
   aws.nodeNameConvention: resource-name
   aws.vmMemoryOverheadPercent: "0.075"
@@ -878,14 +878,6 @@ rules:
   - validatingwebhookconfigurations
   verbs:
   - update
-- apiGroups:
-  - admissionregistration.k8s.io
-  resourceNames:
-  - defaulting.webhook.karpenter.sh
-  resources:
-  - mutatingwebhookconfigurations
-  verbs:
-  - update
 
 ---
 
@@ -1225,7 +1217,7 @@ spec:
           value: arn:aws-test:iam::123456789012:role/karpenter.kube-system.sa.minimal.example.com
         - name: AWS_WEB_IDENTITY_TOKEN_FILE
           value: /var/run/secrets/amazonaws.com/token
-        image: public.ecr.aws/karpenter/controller:v0.27.2
+        image: public.ecr.aws/karpenter/controller:v0.27.3
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:
@@ -1342,39 +1334,6 @@ webhooks:
 
 ---
 
-apiVersion: admissionregistration.k8s.io/v1
-kind: MutatingWebhookConfiguration
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: karpenter.sh
-    app.kubernetes.io/managed-by: kops
-    k8s-addon: karpenter.sh
-  name: defaulting.webhook.karpenter.sh
-webhooks:
-- admissionReviewVersions:
-  - v1
-  clientConfig:
-    service:
-      name: karpenter
-      namespace: kube-system
-  failurePolicy: Fail
-  name: defaulting.webhook.karpenter.sh
-  rules:
-  - apiGroups:
-    - karpenter.sh
-    apiVersions:
-    - v1alpha5
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - provisioners
-    - provisioners/status
-  sideEffects: None
-
----
-
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:

diff --git a/upup/models/cloudup/resources/addons/karpenter.sh/k8s-1.19.yaml.template b/upup/models/cloudup/resources/addons/karpenter.sh/k8s-1.19.yaml.template
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.2
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: provisioners.karpenter.sh
 spec:
@@ -373,12 +373,13 @@ spec:
     storage: true
     subresources:
       status: {}
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.2
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: awsnodetemplates.karpenter.k8s.aws
 spec:
@@ -697,7 +698,7 @@ data:
     "aws.enableENILimitedPodDensity": "false"
     {{ end }}
     "aws.enablePodENI": "false"
-    "aws.interruptionQueue": "false"
+    "aws.interruptionQueueName": ""
     "aws.isolatedVPC": "false"
     {{ if UsesInstanceIDForNodeName }}
     "aws.nodeNameConvention": "resource-name"
@@ -1104,32 +1105,6 @@ webhooks:
           - CREATE
           - UPDATE
 ---
-# Source: karpenter/templates/webhooks-core.yaml
-apiVersion: admissionregistration.k8s.io/v1
-kind: MutatingWebhookConfiguration
-metadata:
-  name: defaulting.webhook.karpenter.sh
-webhooks:
-  - name: defaulting.webhook.karpenter.sh
-    admissionReviewVersions: ["v1"]
-    clientConfig:
-      service:
-        name: karpenter
-        namespace: kube-system
-    failurePolicy: Fail
-    sideEffects: None
-    rules:
-      - apiGroups:
-          - karpenter.sh
-        apiVersions:
-          - v1alpha5
-        resources:
-          - provisioners
-          - provisioners/status
-        operations:
-          - CREATE
-          - UPDATE
----
 # Source: karpenter/templates/webhooks.yaml
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration