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

OCPBUGS-6355: Rebase to v1.15.0 for OCP 4.13 #215

Merged
merged 131 commits into from
Feb 3, 2023
Merged
Changes from 1 commit
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
a6a7b09
Add controller nodeAffinity to prefer EC2 over Fargate
torredil Aug 23, 2022
5012723
Retrieve region/AZ from topology label
torredil Aug 25, 2022
9fb4ada
add initContainer to the controller's template
InsomniaCoder Sep 9, 2022
8767669
Merge pull request #1387 from kubernetes-sigs/release-1.11
k8s-ci-robot Sep 15, 2022
7490575
Release Helm chart v2.11.0
torredil Sep 15, 2022
96dd5aa
add link to install guide
geoffcline Sep 14, 2022
1504bbe
Merge pull request #1388 from torredil/helm-release
k8s-ci-robot Sep 15, 2022
4287fd4
Merge pull request #1383 from geoffcline/patch-1
k8s-ci-robot Sep 16, 2022
3221cca
Update release notes; Implement useOldCSIDriver parameter
ConnorJC3 Sep 16, 2022
6522c55
Merge pull request #1391 from ConnorJC3/fix-helm-chart
k8s-ci-robot Sep 16, 2022
c515a75
Merge pull request #1379 from InsomniaCoder/introduce-init-container
k8s-ci-robot Sep 20, 2022
98da3a7
Add resolver to handle custom endpoints
bertinatto Sep 22, 2022
b62940a
Merge pull request #1398 from bertinatto/fix-custom-endpoints-sts
k8s-ci-robot Sep 22, 2022
666f2bc
Add enableMetrics configuration
torredil Sep 23, 2022
f5aa1b7
Add self to OWNERS
ConnorJC3 Sep 23, 2022
6d70467
Merge pull request #1399 from ConnorJC3/add-self-to-owners
k8s-ci-robot Sep 23, 2022
03cde05
Merge pull request #1380 from torredil/metrics
k8s-ci-robot Sep 23, 2022
fcf2fa7
Merge pull request #1360 from torredil/fargate-affinity
k8s-ci-robot Sep 26, 2022
ad80aef
Move default toleration to values.yaml so it can be overriden if desi…
cnmcavoy Sep 27, 2022
91881c3
Cleanup OWNERS
ConnorJC3 Sep 27, 2022
a8adf9c
Merge pull request #1400 from cnmcavoy/cnmcavoy/override-taints
k8s-ci-robot Sep 28, 2022
5bbff72
Add snow device types to parameters
Sep 28, 2022
4adc00f
Merge pull request #1404 from TerryHowe/add-snow-device-types
k8s-ci-robot Sep 28, 2022
a4cc408
revise preqs for install docs
geoffcline Sep 15, 2022
3d5d549
Merge pull request #1389 from geoffcline/gdc-patch-2
k8s-ci-robot Sep 29, 2022
7f14be8
Release v1.11.4
torredil Sep 29, 2022
c27ccef
Update workflows
torredil Sep 29, 2022
363ae7e
Merge pull request #1406 from torredil/release-1.11
k8s-ci-robot Sep 29, 2022
fabb0d7
Merge pull request #1401 from torredil/update-workflows
k8s-ci-robot Sep 29, 2022
584b169
Merge pull request #1407 from kubernetes-sigs/release-1.11
k8s-ci-robot Sep 29, 2022
4231cd0
Build Windows container for Windows Server 2022 LTSC
ConnorJC3 Sep 29, 2022
e7d9548
Merge pull request #1403 from ConnorJC3/cleanup-owners
k8s-ci-robot Sep 29, 2022
3700dc7
Add .image-* files from Makefile to .gitignore
ConnorJC3 Sep 30, 2022
a5b1b9a
Merge pull request #1410 from ConnorJC3/gitignore-image
k8s-ci-robot Sep 30, 2022
b50903b
Update trivy.yaml workflow event trigger
torredil Sep 30, 2022
562c0a2
Merge pull request #1411 from torredil/update-trivy
k8s-ci-robot Sep 30, 2022
74ab96e
Merge pull request #1408 from ConnorJC3/windows-2022ltsc
k8s-ci-robot Oct 3, 2022
d20afd3
Add support for io2 Block Express volumes
ConnorJC3 Sep 30, 2022
eebda78
Merge pull request #1409 from ConnorJC3/io2-iops
k8s-ci-robot Oct 4, 2022
c60d218
Release v1.12.0
torredil Oct 4, 2022
3bc74c4
Merge pull request #1412 from torredil/release-1.12
k8s-ci-robot Oct 4, 2022
5d25481
Merge pull request #1413 from kubernetes-sigs/release-1.12
k8s-ci-robot Oct 4, 2022
d25d620
Add release and support policy to README.md
torredil Oct 4, 2022
b20a80d
Release Helm chart v2.12.0
torredil Oct 4, 2022
4e19d41
Merge pull request #1392 from torredil/update-readme
k8s-ci-robot Oct 4, 2022
7016a78
Merge pull request #1414 from torredil/helm-release-112
k8s-ci-robot Oct 4, 2022
5860265
Add parameter to force enable snapshotter sidecar
ConnorJC3 Oct 6, 2022
a4ae7df
Upgrade ginkgo to v2
torredil Oct 6, 2022
ddb6bdb
Upgrade K8s to v1.25
torredil Oct 6, 2022
1cfdeb9
Use upstream binary for e2e-kubernetes
torredil Oct 6, 2022
f211462
Merge pull request #1418 from ConnorJC3/force-enable-snapshotter
k8s-ci-robot Oct 7, 2022
6f5db70
Add serviceMonitor.labels parameter
torredil Oct 7, 2022
4c88b87
Merge pull request #1419 from torredil/update-metrics
k8s-ci-robot Oct 7, 2022
c156536
Merge pull request #1341 from torredil/update-k8s-ci
k8s-ci-robot Oct 7, 2022
852a539
Update go version in 1.19
torredil Oct 7, 2022
66c6054
Merge pull request #1421 from torredil/update-go-unit-tests
k8s-ci-robot Oct 7, 2022
d0c961a
Update and run update-gomock
torredil Oct 10, 2022
bf6a5c4
Merge pull request #1422 from torredil/update-go-unit-tests
k8s-ci-robot Oct 10, 2022
eca3bf2
Release v1.12.1
ConnorJC3 Oct 12, 2022
ea4e876
Merge branch 'master' into release-1.12
ConnorJC3 Oct 12, 2022
495f97b
Add version information from tag to GCR build
ConnorJC3 Oct 12, 2022
1c01cde
Merge pull request #1426 from ConnorJC3/fix-version-gcr
k8s-ci-robot Oct 12, 2022
80ddf8f
Merge pull request #1425 from kubernetes-sigs/release-1.12
k8s-ci-robot Oct 13, 2022
fc75036
refactor: Move the default controller tolerations in the helm chart v…
Linutux42 Oct 13, 2022
82def39
Merge pull request #1427 from Linutux42/master
k8s-ci-robot Oct 13, 2022
8fbe47d
[BUG] pkg/driver/controller.go uses ToLower
yevhenvolchenko Oct 13, 2022
ee0a9c4
Merge pull request #1429 from yevhenvolchenko/patch-1
k8s-ci-robot Oct 14, 2022
ab50211
Increase cloudbuild timeout
torredil Oct 14, 2022
3edb878
Merge pull request #1430 from torredil/cloudbuild-timeout
k8s-ci-robot Oct 14, 2022
7f0b31a
Upgrade CI dependencies
torredil Oct 28, 2022
0bffb60
Upgrade Go dependencies
torredil Oct 28, 2022
e693131
Merge pull request #1433 from torredil/upgrade-deps
k8s-ci-robot Oct 31, 2022
a292cb0
Expose volumes and volumeMounts for the ebs-csi-controller deployment
cnmcavoy Oct 28, 2022
458e352
Upgrade golangci-lint; Fix linter errors
torredil Oct 31, 2022
3df37d8
Merge pull request #1436 from cnmcavoy/cnmcavoy/helm-volumes-and-mounts
k8s-ci-robot Nov 1, 2022
db8abf2
Merge pull request #1435 from torredil/upgrade-golangci-lint
k8s-ci-robot Nov 2, 2022
c76f2ff
Use PULL_BASE_REF for VERSION instead of GIT_TAG for GCR builds
ConnorJC3 Nov 4, 2022
6246dc1
Merge pull request #1439 from ConnorJC3/fixup-gcr-version
k8s-ci-robot Nov 4, 2022
a281653
Grab version via tag directly from git
ConnorJC3 Nov 4, 2022
469a681
Release v1.13.0
torredil Nov 4, 2022
c3d2d6d
Merge pull request #1442 from torredil/release-1.13
k8s-ci-robot Nov 7, 2022
d338fca
Merge pull request #1444 from kubernetes-sigs/release-1.13
k8s-ci-robot Nov 7, 2022
84df703
Clean up .travis.yaml
ialidzhikov Nov 10, 2022
3fd4f8c
Merge pull request #1446 from ialidzhikov/cleanup/travis-config
k8s-ci-robot Nov 11, 2022
b1d476c
Update example policy
torredil Nov 16, 2022
586e62a
Merge pull request #1450 from torredil/update-policy
k8s-ci-robot Nov 16, 2022
ea195ef
Update install.md & options.md docs
torredil Dec 13, 2022
8578e6d
Clarify monthly release version policy
ConnorJC3 Dec 15, 2022
7273c1b
Bump go dependencies for release
ConnorJC3 Dec 15, 2022
fca36b0
Drop Windows Server 1809 build
ConnorJC3 Dec 15, 2022
96d0a34
Update CHANGELOGs and bump versions for release v1.14.0
ConnorJC3 Dec 15, 2022
a1945bd
Bump branch in installation docs
ConnorJC3 Dec 15, 2022
2dcdd3e
Add controller.sdkDebugLog parameter
ConnorJC3 Dec 16, 2022
610a1b9
Revert to grabbing tag from PULL_BASE_REF in prow.sh
ConnorJC3 Dec 16, 2022
144df7b
Merge pull request #1458 from torredil/update-docs
k8s-ci-robot Dec 16, 2022
bebe592
Add note about changing sidecars to CHANGELOG
ConnorJC3 Dec 19, 2022
86f165e
Merge pull request #1460 from kubernetes-sigs/release-1.14
k8s-ci-robot Dec 19, 2022
c3cf17f
Support specifying block size for filesystem format
ConnorJC3 Nov 21, 2022
e482d94
Fix volume limits for m6id and x2idn instance types
talnevo Dec 21, 2022
c59eb1d
Merge pull request #1463 from talnevo/patch-1
k8s-ci-robot Dec 21, 2022
3eb7ca5
Touch up Chart.yaml
ConnorJC3 Dec 27, 2022
86dd69c
Update compatibility info in README
torredil Dec 27, 2022
aba27bb
Merge pull request #1465 from torredil/update-readme
k8s-ci-robot Dec 29, 2022
b8e13d1
Fix volume limits for m6id and x2idn instance types
talnevo Dec 21, 2022
00d9bbe
Merge pull request #1470 from ConnorJC3/release-1.14
k8s-ci-robot Jan 5, 2023
dc478af
Release 1.14.1
ConnorJC3 Jan 5, 2023
81881c7
Merge pull request #1471 from ConnorJC3/release-1.14
k8s-ci-robot Jan 5, 2023
dbf04e4
Merge pull request #1472 from kubernetes-sigs/release-1.14
k8s-ci-robot Jan 5, 2023
862fe33
Merge pull request #1452 from ConnorJC3/custom-block-sizes
k8s-ci-robot Jan 5, 2023
8dacb6a
Set sensible default resource requests/limits
ConnorJC3 Dec 19, 2022
3b7a0d4
Add sensible default update strategy
ConnorJC3 Dec 19, 2022
46d358d
Add podAntiAffinity so controller pods prefer scheduling on separate …
ConnorJC3 Dec 19, 2022
3171592
Add container registry parameter
ConnorJC3 Dec 19, 2022
ee857a7
Bump chart version and add CHANGELOG entries
ConnorJC3 Dec 19, 2022
a085f40
Update kustomize manifests with helm chart changes
ConnorJC3 Dec 19, 2022
8eed218
Add test-helm-chart target to Makefile to test Helm chart upgrades
torredil Jan 6, 2023
cd21a03
Merge pull request #1454 from torredil/chart-testing
k8s-ci-robot Jan 6, 2023
c6ea44a
Temporarily disable broken test
ConnorJC3 Jan 10, 2023
9fba69a
Manually setup remote for CT on Prow
ConnorJC3 Jan 10, 2023
7106b0c
Merge pull request #1473 from ConnorJC3/chart-tester-fix
k8s-ci-robot Jan 10, 2023
ce8a68b
Merge pull request #1461 from ConnorJC3/chart-cleanup
k8s-ci-robot Jan 10, 2023
efedd5b
Change default sidecars to EKS-D
ConnorJC3 Jan 11, 2023
16ab52f
Add `helm.sh/hook: test` annotation to chart testing resources
torredil Jan 12, 2023
69015f5
Merge pull request #1477 from torredil/master
k8s-ci-robot Jan 12, 2023
5776b7a
Merge pull request #1475 from ConnorJC3/default-eksd-sidecars
k8s-ci-robot Jan 12, 2023
f5781b9
Merge remote-tracking branch 'openshift/master' into rebase-v1.15.0
RomanBednar Jan 27, 2023
874d755
UPSTREAM: <carry>: Add OpenShift files
jsafrane Sep 8, 2022
1b59585
UPSTREAM: <carry>: Compile with -mod=vendor
jsafrane Sep 8, 2022
7121a24
UPSTREAM: <carry>: Compile without KUBECONFIG
jsafrane Sep 22, 2022
d55ab4f
UPSTREAM: <carry>: Remove .github files
jsafrane Sep 29, 2022
4a51720
UPSTREAM: <carry>: Add vendor/ directory
RomanBednar Jan 27, 2023
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
Prev Previous commit
Next Next commit
Add test-helm-chart target to Makefile to test Helm chart upgrades
Signed-off-by: Eddie Torres <[email protected]>
torredil committed Jan 6, 2023

Verified

This commit was signed with the committer’s verified signature.
torredil Eddie Torres
commit 8eed2185d3c5f0086f4e3726535ae8c1222cf229
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -204,6 +204,14 @@ test-e2e-external-eks:
GINKGO_SKIP="\[Disruptive\]|\[Serial\]" \
./hack/e2e/run.sh

.PHONY: test-helm-chart
test-helm-chart:
AWS_REGION=us-west-2 \
AWS_AVAILABILITY_ZONES=us-west-2a,us-west-2b,us-west-2c \
EBS_INSTALL_SNAPSHOT="true" \
HELM_CT_TEST="true" \
./hack/e2e/run.sh

.PHONY: verify-vendor
test: verify-vendor
verify: verify-vendor
202 changes: 202 additions & 0 deletions charts/aws-ebs-csi-driver/templates/tests/helm-tester.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: helm-sa
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: test-role
rules:
- apiGroups: [ "" ]
resources:
- events
- nodes
- pods
- replicationcontrollers
- serviceaccounts
- configmaps
- persistentvolumes
- persistentvolumeclaims
verbs: [ "list" ]
- apiGroups: [ "" ]
resources:
- services
- nodes
- nodes/proxy
- persistentvolumes
- persistentvolumeclaims
- pods
- pods/log
verbs: [ "get" ]
- apiGroups: [ "" ]
resources:
- namespaces
- persistentvolumes
- persistentvolumeclaims
- pods
- pods/exec
verbs: [ "create" ]
- apiGroups: [ "" ]
resources:
- namespaces
- persistentvolumes
- persistentvolumeclaims
- pods
verbs: [ "delete" ]
- apiGroups: [ "" ]
resources:
- persistentvolumeclaims
verbs: [ "update" ]
- apiGroups: [ "" ]
resources:
- pods/ephemeralcontainers
verbs: [ "patch" ]
- apiGroups: [ "" ]
resources:
- serviceaccounts
- configmaps
verbs: [ "watch" ]
- apiGroups: [ "apps" ]
resources:
- replicasets
- daemonsets
verbs: [ "list" ]
- apiGroups: [ "storage.k8s.io" ]
resources:
- storageclasses
verbs: [ "create" ]
- apiGroups: [ "storage.k8s.io" ]
resources:
- storageclasses
- csinodes
verbs: [ "get" ]
- apiGroups: [ "storage.k8s.io" ]
resources:
- storageclasses
verbs: [ "delete" ]
- apiGroups: [ "snapshot.storage.k8s.io" ]
resources:
- volumesnapshots
- volumesnapshotclasses
- volumesnapshotcontents
verbs: [ "create" ]
- apiGroups: [ "snapshot.storage.k8s.io" ]
resources:
- volumesnapshots
- volumesnapshotclasses
- volumesnapshotcontents
verbs: [ "get" ]
- apiGroups: [ "snapshot.storage.k8s.io" ]
resources:
- volumesnapshotcontents
verbs: [ "update" ]
- apiGroups: [ "snapshot.storage.k8s.io" ]
resources:
- volumesnapshots
- volumesnapshotclasses
- volumesnapshotcontents
verbs: [ "delete" ]
- apiGroups: [ "authorization.k8s.io" ]
resources:
- clusterroles
verbs: [ "list" ]
- apiGroups: [ "authorization.k8s.io" ]
resources:
- subjectaccessreviews
verbs: [ "create" ]
- apiGroups: [ "rbac.authorization.k8s.io" ]
resources:
- clusterroles
verbs: [ "list" ]
- apiGroups: [ "rbac.authorization.k8s.io" ]
resources:
- clusterrolebindings
verbs: [ "create" ]
---
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: test-role-binding
subjects:
- kind: ServiceAccount
name: helm-sa
namespace: kube-system
roleRef:
kind: ClusterRole
name: test-role
apiGroup: rbac.authorization.k8s.io
---
apiVersion: v1
kind: ConfigMap
data:
manifests.yaml: |
ShortName: ebs
StorageClass:
FromFile: storageclass.yaml
SnapshotClass:
FromName: true
DriverInfo:
Name: ebs.csi.aws.com
SupportedSizeRange:
Min: 1Gi
Max: 16Ti
SupportedFsType:
xfs: {}
ext4: {}
SupportedMountOption:
dirsync: {}
TopologyKeys: ["topology.ebs.csi.aws.com/zone"]
Capabilities:
persistence: true
fsGroup: true
block: true
exec: true
snapshotDataSource: true
pvcDataSource: false
multipods: true
controllerExpansion: true
nodeExpansion: true
volumeLimits: true
topology: true
storageclass.yaml: |
kind: StorageClass
apiVersion: storage.k8s.io/v1
metadata:
name: ebs.csi.aws.com
provisioner: ebs.csi.aws.com
volumeBindingMode: WaitForFirstConsumer
metadata:
name: manifest-config
---
apiVersion: v1
kind: Pod
metadata:
name: helm-test
annotations:
"helm.sh/hook": test
spec:
containers:
- name: helm-test
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20220624-1a63fdd9f2-master
command: [ "/bin/sh", "-c" ]
args:
- |
cp /etc/config/storageclass.yaml /workspace/storageclass.yaml
go install sigs.k8s.io/kubetest2/...@latest
kubectl config set-cluster cluster --server=https://kubernetes.default --certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt
kubectl config set-context kubetest2 --cluster=cluster
kubectl config set-credentials sa --token=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
kubectl config set-context kubetest2 --user=sa
kubectl config use-context kubetest2
kubetest2 noop --run-id='e2e-kubernetes' --test=ginkgo -- --test-package-version=$(curl https://storage.googleapis.com/kubernetes-release/release/stable-1.25.txt) --skip-regex='\[Disruptive\]|\[Serial\]' --focus-regex='External.Storage' --parallel=25 --test-args='-storage.testdriver=/etc/config/manifests.yaml'
volumeMounts:
- name: config-vol
mountPath: /etc/config
serviceAccountName: helm-sa
volumes:
- name: config-vol
configMap:
name: manifest-config
restartPolicy: Never
5 changes: 3 additions & 2 deletions charts/aws-ebs-csi-driver/values.yaml
Original file line number Diff line number Diff line change
@@ -183,8 +183,9 @@ controller:
# cpu: 100m
# memory: 128Mi
serviceAccount:
create: true # A service account will be created for you if set to true. Set to false if you want to use your own.
name: ebs-csi-controller-sa # Name of the service-account to be used/created.
# A service account will be created for you if set to true. Set to false if you want to use your own.
create: true
name: ebs-csi-controller-sa
annotations: {}
tolerations:
- key: CriticalAddonsOnly
15 changes: 15 additions & 0 deletions hack/e2e/chart-testing.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash

set -uo pipefail

function ct_install() {
INSTALL_PATH=${1}
CHART_TESTING_VERSION=${2}
if [[ ! -e ${INSTALL_PATH}/chart-testing ]]; then
CHART_TESTING_DOWNLOAD_URL="https://github.com/helm/chart-testing/releases/download/v${CHART_TESTING_VERSION}/chart-testing_${CHART_TESTING_VERSION}_linux_amd64.tar.gz"
curl --silent --location "${CHART_TESTING_DOWNLOAD_URL}" | tar xz -C "${INSTALL_PATH}"
chmod +x "${INSTALL_PATH}"/ct
fi

python3 -m pip install yamllint yamale
}
Loading