Skip to content

Commit 50e1921

Browse files
committed
update CLM
1 parent 46c1305 commit 50e1921

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

cluster/config-defaults.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,8 @@ config_provider_service: "false"
978978
enable_size_memory_backed_volumes: "true"
979979

980980
karpenter_pools_enabled: "false"
981+
#karpenter_main_crd_name: "provisioners.karpenter.sh"
982+
karpenter_main_crd_name: "nodepools.karpenter.sh" # testing
981983

982984
# enable StatefulSetAutoDeletePVC feature flag
983985
# https://kubernetes.io/blog/2021/12/16/kubernetes-1-23-statefulset-pvc-auto-deletion/

cluster/manifests/deletions.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,6 @@ post_apply:
175175
kind: ClusterRole
176176
- name: karpenter-webhook
177177
kind: ClusterRoleBinding
178-
- name: provisioners.karpenter.sh
179-
kind: CustomResourceDefinition
180-
- name: awsnodetemplates.karpenter.k8s.aws
181-
kind: CustomResourceDefinition
182-
- name: machines.karpenter.sh
183-
kind: CustomResourceDefinition
184178
- name: karpenter-global-settings
185179
kind: ConfigMap
186180
namespace: kube-system
@@ -199,6 +193,12 @@ post_apply:
199193
- name: validation.webhook.karpenter.sh
200194
kind: ValidatingWebhookConfiguration
201195
{{ if eq .Cluster.ConfigItems.karpenter_pools_enabled "false" }}
196+
- name: provisioners.karpenter.sh
197+
kind: CustomResourceDefinition
198+
- name: awsnodetemplates.karpenter.k8s.aws
199+
kind: CustomResourceDefinition
200+
- name: machines.karpenter.sh
201+
kind: CustomResourceDefinition
202202
- name: karpenter
203203
namespace: kube-system
204204
kind: Deployment

test/e2e/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN chmod +x /usr/bin/kubectl
2626
COPY --from=builder /go/bin/ginkgo /usr/local/bin/ginkgo
2727

2828
# copy CLM
29-
COPY --from=container-registry.zalando.net/teapot/cluster-lifecycle-manager:latest /clm /usr/bin/clm
29+
COPY --from=container-registry-test.zalando.net/teapot/cluster-lifecycle-manager:pr-744-1 /clm /usr/bin/clm
3030
COPY --from=container-registry.zalando.net/teapot/aws-account-creator:latest /aws-account-creator /usr/bin/aws-account-creator
3131

3232
ADD . /workdir

0 commit comments

Comments
 (0)