Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add compatibility workaround for A1 instance family #1805

Merged
merged 1 commit into from
Oct 27, 2023

Conversation

ConnorJC3
Copy link
Contributor

Is this a bug fix or adding new feature?

Bug fix

What is this PR about? / Why do we need it?

Adds compatibility for running on instances with the a1 instance family

What testing is done?

$ helm install aws-ebs-csi-driver . --set a1CompatibilityDaemonSet=true --set image.repository=368597081700.dkr.ecr.us-west-2.amazonaws.com/aws-ebs-csi-driver --set image.tag=fdb98666fa056862748ca337049f907d7b080e25
NAME: aws-ebs-csi-driver
LAST DEPLOYED: Wed Oct 25 15:15:29 2023
NAMESPACE: default
STATUS: deployed
REVISION: 1
NOTES:
To verify that aws-ebs-csi-driver has started, run:

    kubectl get pod -n default -l "app.kubernetes.io/name=aws-ebs-csi-driver,app.kubernetes.io/instance=aws-ebs-csi-driver"

NOTE: The [CSI Snapshotter](https://github.com/kubernetes-csi/external-snapshotter) controller and CRDs will no longer be installed as part of this chart and moving forward will be a prerequisite of using the snap shotting functionality.

$ kubectl get daemonsets.apps                   
NAME                    DESIRED   CURRENT   READY   UP-TO-DATE   AVAILABLE   NODE SELECTOR            AGE
ebs-csi-node            0         0         0       0            0           kubernetes.io/os=linux   3m30s
ebs-csi-node-a1compat   1         1         1       1            1           kubernetes.io/os=linux   3m30s

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 25, 2023
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 25, 2023
@ConnorJC3 ConnorJC3 force-pushed the a1compat branch 2 times, most recently from 3ac3e1a to cc6f934 Compare October 25, 2023 15:50
@ConnorJC3
Copy link
Contributor Author

/retest

1 similar comment
@ConnorJC3
Copy link
Contributor Author

/retest

@AndrewSirenko
Copy link
Contributor

/lgtm

Excited for optimize makefile & run.sh task to clean up 🍝 though...

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 25, 2023
Copy link
Contributor

@wmesard wmesard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One question

(dict
"key" "eks.amazonaws.com/compute-type"
"operator" "NotIn"
"values" (list "fargate")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this Fargate-specific check necessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if it's absolutely necessary here, in order to make the minimal change necessary I pulled it from our defaults: https://github.com/kubernetes-sigs/aws-ebs-csi-driver/blob/master/charts/aws-ebs-csi-driver/values.yaml#L319-L327
(so the resulting change is the default + the a1 restriction, rather than the default replaced by the a1 restriction)

Even if it's not actually necessary, it definitely won't hurt, and considering we don't control what EKS fargate does it would be bad if in some future they started vending nodes with an a1 "instance type" and we tried to run on them.

Comment on lines +30 to +31
IMAGE=${IMAGE_NAME} TAG=${IMAGE_TAG} OS=linux ARCH=amd64 OSVERSION=al2023 make image
docker tag "${IMAGE_NAME}":"${IMAGE_TAG}"-linux-amd64-al2023 "${IMAGE_NAME}":"${IMAGE_TAG}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Out of scope for this PR, but it would be better if this extracted the information from the resulting image, instead of passing it in. Having it hardcoded here and in the Makefile is tech debt that will bite us eventually.)

Copy link
Contributor

@AndrewSirenko AndrewSirenko Oct 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding to our 'optimize makefile & run.sh task' backlog task.

@k8s-ci-robot
Copy link
Contributor

@wmesard: changing LGTM is restricted to collaborators

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@AndrewSirenko
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AndrewSirenko

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 26, 2023
@AndrewSirenko
Copy link
Contributor

/retest

1 similar comment
@ConnorJC3
Copy link
Contributor Author

/retest

@k8s-ci-robot k8s-ci-robot merged commit 02f1d73 into kubernetes-sigs:master Oct 27, 2023
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants