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.

Sign up for GitHub

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

Arm overlay #653

Merged
merged 2 commits into from
Dec 11, 2020
Merged

Arm overlay #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
688c5dd
Update sidecar images
Dec 11, 2020
3cdd760
Add overlay for arm images
Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/aws-ebs-csi-driver/templates/clusterrole-attacher.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
rules:
- apiGroups: [""]
resources: ["persistentvolumes"]
verbs: ["get", "list", "watch", "update"]
verbs: ["get", "list", "watch", "update", "patch"]
Copy link
Contributor

Choose a reason for hiding this comment

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

did you test the helm install /kustomize command? like if I have helm installed a prevoius version them helm install this version, i would assume that helm is smart enough to delete/recreate this object.

- apiGroups: [""]
resources: ["nodes"]
verbs: ["get", "list", "watch"]
Expand All @@ -17,4 +17,4 @@ rules:
verbs: ["get", "list", "watch"]
- apiGroups: ["storage.k8s.io"]
resources: ["volumeattachments"]
verbs: ["get", "list", "watch", "update"]
verbs: ["get", "list", "watch", "update", "patch"]
1 change: 0 additions & 1 deletion charts/aws-ebs-csi-driver/templates/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ spec:
- --csi-address=$(ADDRESS)
- --v=5
- --leader-election=true
- --leader-election-type=leases
Copy link
Contributor

Choose a reason for hiding this comment

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

we don't need this because the default changed to leases right? just checking

Copy link
Contributor

Choose a reason for hiding this comment

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

or they removed the option an dit's leases only?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah they removed it and it's leases.

env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
Expand Down
8 changes: 4 additions & 4 deletions charts/aws-ebs-csi-driver/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ sidecars:
tag: "v1.6.0"
attacherImage:
repository: quay.io/k8scsi/csi-attacher
tag: "v1.2.0"
tag: "v2.2.0"
snapshotterImage:
repository: quay.io/k8scsi/csi-snapshotter
tag: "v2.1.1"
livenessProbeImage:
repository: quay.io/k8scsi/livenessprobe
tag: "v1.1.0"
tag: "v2.1.0"
resizerImage:
repository: quay.io/k8scsi/csi-resizer
tag: "v0.3.0"
tag: "v0.5.0"
nodeDriverRegistrarImage:
repository: quay.io/k8scsi/csi-node-driver-registrar
tag: "v1.1.0"
tag: "v1.3.0"

imagePullSecrets: []
nameOverride: ""
Expand Down
4 changes: 2 additions & 2 deletions deploy/kubernetes/base/clusterrole-attacher.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
rules:
- apiGroups: [""]
resources: ["persistentvolumes"]
verbs: ["get", "list", "watch", "update"]
verbs: ["get", "list", "watch", "update", "patch"]
- apiGroups: [""]
resources: ["nodes"]
verbs: ["get", "list", "watch"]
Expand All @@ -18,4 +18,4 @@ rules:
verbs: ["get", "list", "watch"]
- apiGroups: ["storage.k8s.io"]
resources: ["volumeattachments"]
verbs: ["get", "list", "watch", "update"]
verbs: ["get", "list", "watch", "update", "patch"]
5 changes: 2 additions & 3 deletions deploy/kubernetes/base/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,19 @@ spec:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-attacher
image: quay.io/k8scsi/csi-attacher:v1.2.0
image: quay.io/k8scsi/csi-attacher:v2.2.0
args:
- --csi-address=$(ADDRESS)
- --v=5
- --leader-election=true
- --leader-election-type=leases
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
volumeMounts:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: liveness-probe
image: quay.io/k8scsi/livenessprobe:v1.1.0
image: quay.io/k8scsi/livenessprobe:v2.1.0
args:
- --csi-address=/csi/csi.sock
volumeMounts:
Expand Down
4 changes: 2 additions & 2 deletions deploy/kubernetes/base/node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ spec:
periodSeconds: 10
failureThreshold: 5
- name: node-driver-registrar
image: quay.io/k8scsi/csi-node-driver-registrar:v1.1.0
image: quay.io/k8scsi/csi-node-driver-registrar:v1.3.0
args:
- --csi-address=$(ADDRESS)
- --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
Expand All @@ -88,7 +88,7 @@ spec:
- name: registration-dir
mountPath: /registration
- name: liveness-probe
image: quay.io/k8scsi/livenessprobe:v1.1.0
image: quay.io/k8scsi/livenessprobe:v2.1.0
args:
- --csi-address=/csi/csi.sock
volumeMounts:
Expand Down
19 changes: 19 additions & 0 deletions deploy/kubernetes/overlays/stable/arm64/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
bases:
- ../../../base
images:
- name: k8s.gcr.io/provider-aws/aws-ebs-csi-driver
newTag: v0.8.0
- name: quay.io/k8scsi/csi-provisioner
newName: raspbernetes/csi-external-provisioner
newTag: "1.6.0"
- name: quay.io/k8scsi/csi-attacher
newName: raspbernetes/csi-external-attacher
newTag: "2.2.0"
- name: quay.io/k8scsi/livenessprobe
newName: k8s.gcr.io/sig-storage/livenessprobe
newTag: "v2.1.0"
- name: quay.io/k8scsi/csi-node-driver-registrar
newName: raspbernetes/csi-node-driver-registrar
newTag: "1.3.0"
2 changes: 1 addition & 1 deletion deploy/kubernetes/overlays/stable/ecr/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Kustomization
bases:
- ../../../base
images:
- name: amazon/aws-ebs-csi-driver
- name: k8s.gcr.io/provider-aws/aws-ebs-csi-driver
newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/aws-ebs-csi-driver
newTag: v0.7.1
- name: quay.io/k8scsi/csi-provisioner
Expand Down
6 changes: 3 additions & 3 deletions deploy/kubernetes/overlays/stable/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ images:
- name: quay.io/k8scsi/csi-provisioner
newTag: v1.5.0
- name: quay.io/k8scsi/csi-attacher
newTag: v1.2.0
newTag: v2.2.0
- name: quay.io/k8scsi/livenessprobe
newTag: v1.1.0
newTag: v2.1.0
- name: quay.io/k8scsi/csi-node-driver-registrar
newTag: v1.1.0
newTag: v1.3.0
2 changes: 1 addition & 1 deletion tester/multi-az-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ install: |

uninstall: |
echo "Removing driver"
bin/helm del --purge aws-ebs-csi-driver
bin/helm delete aws-ebs-csi-driver

test: |
go get github.com/onsi/ginkgo/ginkgo
Expand Down
2 changes: 1 addition & 1 deletion tester/single-az-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ install: |

uninstall: |
echo "Removing driver"
bin/helm del --purge aws-ebs-csi-driver
bin/helm delete aws-ebs-csi-driver

test: |
go get github.com/onsi/ginkgo/ginkgo
Expand Down