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

STOR-860: Rebase to v1.11.4 for OCP 4.12 #206

Merged
merged 294 commits into from
Sep 28, 2022

Conversation

jsafrane
Copy link

@jsafrane jsafrane commented Sep 8, 2022

Diff to upstream v1.11.4:
kubernetes-sigs/aws-ebs-csi-driver@v1.11.4...jsafrane:rebase-v1.11.2

Notable changes since v1.5.1 @ 4.11:

  • Upstream dropped vendor/ directory, added it back + updated Makefile to build with -mod=vendor for offline OCP builds.
  • Use mount utils to check if volume needs resizing
  • Adding tagging support through StorageClass.parameters

Full changelog: https://github.com/kubernetes-sigs/aws-ebs-csi-driver/blob/master/CHANGELOG.md

@openshift/storage

k8s-ci-robot and others added 30 commits December 16, 2021 14:40
Fix the wrong app and helm chart version
…l_device_resolution

Fix canonical nvme device resolution in more cases
Set prerelease=true for new releases before images are ready
Update cluster role configuration for external snapshotter
Merge release-1.5 to master for v1.5.1
…ation-iss21

Update examples/kubernetes README files
Update helm charts for a secrect exposure
This commit fixes the `getVolumesLimit` function.

Previously, the volume limit for Nitro instances was based off of a
regex. This regex is insufficient for the wide variety of Nitro
instances that AWS supports today.

Nitro instances share attachments with ENIs and NVMe instance
stores.

The number of attached ENIs is queried through IMDS, against the
`network/interfaces/macs` endpoint.

The number of already attached block devices is also queried through
IMDS, against the `block-device-mapping` endpoint.

Currently, IMDS does not provide a way to query NVMe instance store
volumes. So, all instances that support NVMe instance stores are listed
in `pkg/cloud/volume_limits.go`

This commit also added more tests to cover various scenarios.
Fix nodeService.getVolumesLimit() adding more instance types
Signed-off-by: Eddie Torres <[email protected]>
…ume-id-empty

Fix windows mounting bug-1090
Update deprecated command `go get`
@jsafrane jsafrane force-pushed the rebase-v1.11.2 branch 6 times, most recently from 47c1d46 to e06cb79 Compare September 23, 2022 12:02
@jsafrane
Copy link
Author

/label docs-approved
/label px-approved

We don't document / announce CSI driver version bumps to customers.

@openshift-ci openshift-ci bot added docs-approved Signifies that Docs has signed off on this PR px-approved Signifies that Product Support has signed off on this PR labels Sep 23, 2022
@jsafrane jsafrane force-pushed the rebase-v1.11.2 branch 3 times, most recently from 8270bb5 to f16656f Compare September 23, 2022 14:02
@jsafrane
Copy link
Author

jsafrane commented Sep 26, 2022

I finally convinced CI to run make verify without Kubernetes env. variables, see the new <carry> patch

@gnufied
Copy link
Member

gnufied commented Sep 26, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 26, 2022
@Phaow
Copy link

Phaow commented Sep 27, 2022

Pre verify pass with * Clusterversion: 4.12.0-0.ci.test-2022-09-27-002049-ci-ln-2iv4tmk-latest * Platform: AWS * NetWorking: OVNKubernetes *
All the regression automation test passed and the new feature about Tags usage manual test passed.

error: 1 fail, 58 pass, 58 skip (1h3m17s)

The 1 failed is caused by in sts cluster the credential don't has the reboot instance right. I'll fix the code later.

It seems only a bit strange issue about check the driver version, I'm not sure what causes the driverVersion not as expected by check cmd. It should be 1.11.3 from the Makefile https://github.com/openshift/aws-ebs-csi-driver/pull/206/files#diff-76ed074a9305c04054cdebb9e9aad2d818052b07091de1f20cad0bbac34ffb52R28 .

$ oc -n openshift-cluster-csi-drivers exec -c csi-driver deploy/aws-ebs-csi-driver-controller -- /bin/aws-ebs-csi-driver -version | jq .
{
  "driverVersion": "1.19",
  "gitCommit": "c196fbefa329c9f064ae8c2e3101b8da03f7d931",
  "buildDate": "2022-09-27T00:19:32+00:00",
  "goVersion": "go1.19.1",
  "compiler": "gc",
  "platform": "linux/amd64"
}

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 27, 2022
hack/verify-kustomize reads the current namespace and adds it into
generated / verified manifests.

With KUBECONFIG="", it won't be able to get the namespace and thus it will
generate manifests with namespace: default.
@jsafrane
Copy link
Author

jsafrane commented Sep 27, 2022

Removed VERSION env. var - CI sets it to go version, not to CSI driver version
+ cleaned up the last carry patch that removes KUBECONFIG.

Currently, setting the AWS_EC2_ENDPOINT environment variable
overwrites the STS endpoint as well. This patch adds a custom
resolver to only set a custom endpoint on EC2 service.
@openshift-ci
Copy link

openshift-ci bot commented Sep 27, 2022

@jsafrane: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-csi-migration f3d2bee link false /test e2e-aws-csi-migration

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@Phaow
Copy link

Phaow commented Sep 28, 2022

Pre verify pass with * Clusterversion: 4.12.0-0.ci.test-2022-09-27-101247-ci-ln-qy5rtjk-latest * Platform: AWS * NetWorking: OVNKubernetes *
All the regression automation test passed and the new feature about Tags usage manual test passed.

60 pass, 57 skip (1h1m16s)

The driverVersion issue fixed, currently there's an upstream issue the v1.11.4 not update the version in Makefile so still v1.11.3.

$ oc -n openshift-cluster-csi-drivers exec -c csi-driver deploy/aws-ebs-csi-driver-controller -- /bin/aws-ebs-csi-driver -version | jq .
{
  "driverVersion": "v1.11.3",
  "gitCommit": "3b8232ac94da43dba9a73ac71927c65a9434605a",
  "buildDate": "2022-09-27T10:11:20+00:00",
  "goVersion": "go1.19.1",
  "compiler": "gc",
  "platform": "linux/amd64"
}

@Phaow
Copy link

Phaow commented Sep 28, 2022

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Sep 28, 2022
@dobsonj
Copy link
Member

dobsonj commented Sep 28, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 28, 2022
@openshift-merge-robot openshift-merge-robot merged commit 4bbcda6 into openshift:master Sep 28, 2022
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. docs-approved Signifies that Docs has signed off on this PR lgtm Indicates that a PR is ready to be merged. px-approved Signifies that Product Support has signed off on this PR qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.