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

Fix version of K8s manifest images #1303

Merged
merged 1 commit into from
Jul 8, 2022
Merged

Fix version of K8s manifest images #1303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions deploy/kubernetes/base/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
tolerationSeconds: 300
containers:
- name: ebs-plugin
image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.8.0
image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver
imagePullPolicy: IfNotPresent
args:
# - {all,controller,node} # specify the driver mode
Expand Down Expand Up @@ -87,7 +87,7 @@ spec:
periodSeconds: 10
failureThreshold: 5
- name: csi-provisioner
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0
image: k8s.gcr.io/sig-storage/csi-provisioner
imagePullPolicy: IfNotPresent
args:
- --csi-address=$(ADDRESS)
Expand All @@ -103,7 +103,7 @@ spec:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-attacher
image: k8s.gcr.io/sig-storage/csi-attacher:v3.4.0
image: k8s.gcr.io/sig-storage/csi-attacher
imagePullPolicy: IfNotPresent
args:
- --csi-address=$(ADDRESS)
Expand All @@ -116,7 +116,7 @@ spec:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-snapshotter
image: k8s.gcr.io/sig-storage/csi-snapshotter:v6.0.1
image: k8s.gcr.io/sig-storage/csi-snapshotter
imagePullPolicy: IfNotPresent
args:
- --csi-address=$(ADDRESS)
Expand All @@ -128,7 +128,7 @@ spec:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-resizer
image: k8s.gcr.io/sig-storage/csi-resizer:v1.4.0
image: k8s.gcr.io/sig-storage/csi-resizer
imagePullPolicy: IfNotPresent
args:
- --csi-address=$(ADDRESS)
Expand All @@ -141,7 +141,7 @@ spec:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: liveness-probe
image: k8s.gcr.io/sig-storage/livenessprobe:v2.5.0
image: k8s.gcr.io/sig-storage/livenessprobe
imagePullPolicy: IfNotPresent
args:
- --csi-address=/csi/csi.sock
Expand Down
6 changes: 3 additions & 3 deletions deploy/kubernetes/base/node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
- name: ebs-plugin
securityContext:
privileged: true
image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.8.0
image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver
imagePullPolicy: IfNotPresent
args:
- node
Expand Down Expand Up @@ -80,7 +80,7 @@ spec:
periodSeconds: 10
failureThreshold: 5
- name: node-driver-registrar
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar
imagePullPolicy: IfNotPresent
args:
- --csi-address=$(ADDRESS)
Expand All @@ -97,7 +97,7 @@ spec:
- name: registration-dir
mountPath: /registration
- name: liveness-probe
image: k8s.gcr.io/sig-storage/livenessprobe:v2.5.0
image: k8s.gcr.io/sig-storage/livenessprobe
imagePullPolicy: IfNotPresent
args:
- --csi-address=/csi/csi.sock
Expand Down
12 changes: 6 additions & 6 deletions deploy/kubernetes/overlays/stable/ecr-public/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ images:
newName: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver
- name: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-provisioner
newName: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
newTag: v2.1.1-eks-1-18-13
tagSuffix: -eks-1-20-15
- name: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-attacher
newName: public.ecr.aws/eks-distro/kubernetes-csi/external-attacher
newTag: v3.1.0-eks-1-18-13
tagSuffix: -eks-1-20-15
- name: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/livenessprobe
newName: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
newTag: v2.2.0-eks-1-18-13
tagSuffix: -eks-1-20-15
- name: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-snapshotter
newName: public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter
newTag: v5.0.1-eks-1-22-7
tagSuffix: -eks-1-20-17
- name: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-resizer
newName: public.ecr.aws/eks-distro/kubernetes-csi/external-resizer
newTag: v1.1.0-eks-1-18-13
tagSuffix: -eks-1-20-15
- name: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-node-driver-registrar
newName: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
newTag: v2.1.0-eks-1-18-13
tagSuffix: -eks-1-20-17
18 changes: 9 additions & 9 deletions deploy/kubernetes/overlays/stable/gcr/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ bases:
- ../../../base
images:
- name: k8s.gcr.io/provider-aws/aws-ebs-csi-driver
newTag: v1.6.1
- name: k8s.gcr.io/sig-storage/csi-provisioner
newTag: v2.1.1
newTag: v1.8.0
- name: k8s.gcr.io/sig-storage/csi-attacher
newTag: v3.4.0
- name: k8s.gcr.io/sig-storage/csi-node-driver-registrar
newTag: v2.5.1
- name: k8s.gcr.io/sig-storage/csi-provisioner
newTag: v3.1.0
- name: k8s.gcr.io/sig-storage/livenessprobe
newTag: v2.4.0
- name: k8s.gcr.io/sig-storage/csi-resizer
newTag: v1.4.0
- name: k8s.gcr.io/sig-storage/csi-snapshotter
newTag: v6.0.1
- name: k8s.gcr.io/sig-storage/csi-resizer
newTag: v1.1.0
- name: k8s.gcr.io/sig-storage/csi-node-driver-registrar
newTag: v2.1.0
- name: k8s.gcr.io/sig-storage/livenessprobe
newTag: v2.6.0
8 changes: 0 additions & 8 deletions deploy/kubernetes/secret.yaml
View file
Open in desktop

This file was deleted.

9 changes: 5 additions & 4 deletions docs/install.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
The driver requires IAM permission to talk to Amazon EBS to manage the volume on user's behalf. [The example policy here](./example-iam-policy.json) defines these permissions. There are several methods to grant the driver IAM permission:
* Using IAM [instance profile](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html) - attach the policy to the instance profile IAM role and turn on access to [instance metadata](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html) for the instance(s) on which the driver Deployment will run
* EKS only: Using [IAM roles for ServiceAccounts](https://docs.aws.amazon.com/eks/latest/userguide/iam-roles-for-service-accounts.html) - create an IAM role, attach the policy to it, then follow the IRSA documentation to associate the IAM role with the driver Deployment service account, which if you are installing via Helm is determined by value `controller.serviceAccount.name`, `ebs-csi-controller-sa` by default
* Using secret object - create an IAM user, attach the policy to it, put that user's credentials in [secret manifest](../deploy/kubernetes/secret.yaml), then deploy the secret
* Using secret object - create an IAM user, attach the policy to it, then create a generic secret called `aws-secret` in the `kube-system` namespace with the user's credentials
```sh
curl https://raw.githubusercontent.com/kubernetes-sigs/aws-ebs-csi-driver/master/deploy/kubernetes/secret.yaml > secret.yaml
# Edit the secret with user credentials
kubectl apply -f secret.yaml
kubectl create secret generic aws-secret \
--namespace kube-system \
--from-literal "key_id=${AWS_ACCESS_KEY_ID}" \
--from-literal "access_key=${AWS_SECRET_ACCESS_KEY}"
```

#### Config node toleration settings
Expand Down