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

Update lib-external-provisioner and cleanup constraints #244

Merged
merged 2 commits into from
Mar 13, 2019

Conversation

msau42
Copy link
Collaborator

@msau42 msau42 commented Mar 8, 2019

This is needed for #238

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 8, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: msau42

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 requested review from lpabon and saad-ali March 8, 2019 01:28
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 8, 2019
@msau42
Copy link
Collaborator Author

msau42 commented Mar 8, 2019

I was able to get past conflicts with lib-external-provisioner, but now I'm hitting conflicts with external-snapshotter.

@jsafrane can you help cleanup the constraints in external-snapshotter?

Gopkg.toml Outdated

[[constraint]]
[[override]]
name = "github.com/kubernetes-sigs/sig-storage-lib-external-provisioner"
Copy link
Collaborator

@ddebroy ddebroy Mar 8, 2019

Choose a reason for hiding this comment

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

This name may also need to switch to sigs.k8s.io/sig-storage-lib-external-provisioner? I kept running dep ensure failures without the above switch - so just wanted to call it out.

@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 8, 2019
@jsafrane
Copy link
Contributor

vendor/sigs.k8s.io/sig-storage-lib-external-provisioner/controller/controller.go:805:30: too many arguments in call to resourcelock.New
	have (string, string, string, "github.com/kubernetes-csi/external-provisioner/vendor/k8s.io/client-go/kubernetes/typed/core/v1".CoreV1Interface, nil, resourcelock.ResourceLockConfig)
	want (string, string, string, "github.com/kubernetes-csi/external-provisioner/vendor/k8s.io/client-go/kubernetes/typed/core/v1".CoreV1Interface, resourcelock.ResourceLockConfig)

This comes from lib-external-provisioner using master client-go. Update to v1.14.0-beta.1 should help, however, you need to update external-snapshotter first.

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 12, 2019
@msau42
Copy link
Collaborator Author

msau42 commented Mar 13, 2019

Update: Things compile now. I'm trying to run the hostpath e2es with my private image and many are failing. Am debugging...

@msau42
Copy link
Collaborator Author

msau42 commented Mar 13, 2019

39493 csi-hostpath-provisioner-0/csi-provisioner: /csi-provisioner flag redefined: log_dir
39494 csi-hostpath-provisioner-0/csi-provisioner: panic: /csi-provisioner flag redefined: log_dir
39495 csi-hostpath-provisioner-0/csi-provisioner: 
39496 csi-hostpath-provisioner-0/csi-provisioner: goroutine 1 [running]:
39497 csi-hostpath-provisioner-0/csi-provisioner: flag.(*FlagSet).Var(0xc0000a0120, 0x1688760, 0x23b3a10, 0x14e2f18, 0x7, 0x15139f8, 0x2f)
39498 csi-hostpath-provisioner-0/csi-provisioner:     /usr/local/google/home/msau/.gvm/gos/go1.11.1/src/flag/flag.go:805 +0x529
39499 csi-hostpath-provisioner-0/csi-provisioner: flag.(*FlagSet).StringVar(0xc0000a0120, 0x23b3a10, 0x14e2f18, 0x7, 0x0, 0x0, 0x15139f8, 0x2f)
39500 csi-hostpath-provisioner-0/csi-provisioner:     /usr/local/google/home/msau/.gvm/gos/go1.11.1/src/flag/flag.go:708 +0x8a
39501 csi-hostpath-provisioner-0/csi-provisioner: github.com/kubernetes-csi/external-provisioner/vendor/k8s.io/klog.InitFlags(0xc0000a0120)
39502 csi-hostpath-provisioner-0/csi-provisioner:     /usr/local/google/home/msau/workspace/go/src/github.com/kubernetes-csi/external-provisioner/vendor/k8s.io/klog/klog.go:411 +0x7b
39503 csi-hostpath-provisioner-0/csi-provisioner: main.init.0()
39504 csi-hostpath-provisioner-0/csi-provisioner:     /usr/local/google/home/msau/workspace/go/src/github.com/kubernetes-csi/external-provisioner/cmd/csi-provisioner/csi-provisioner.go:75 +0x13e

@msau42
Copy link
Collaborator Author

msau42 commented Mar 13, 2019

This may be because glog got pulled in again for some reason...

@msau42
Copy link
Collaborator Author

msau42 commented Mar 13, 2019

actually no, glog was already in vendor before this change

@msau42 msau42 force-pushed the update-lib branch 2 times, most recently from 221e339 to 973e671 Compare March 13, 2019 06:02
@msau42
Copy link
Collaborator Author

msau42 commented Mar 13, 2019

Trying again with just "dep ensure" instead of "dep ensure -update".

@msau42 msau42 changed the title WIP: Update lib-external-provisioner and cleanup constraints Update lib-external-provisioner and cleanup constraints Mar 13, 2019
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 13, 2019
@msau42
Copy link
Collaborator Author

msau42 commented Mar 13, 2019

Tested and passed with PD driver.

I'm still having issues with hostpath e2es but I think it's unrelated to this change.

@pohly
Copy link
Contributor

pohly commented Mar 13, 2019 via email

Gopkg.toml Show resolved Hide resolved
@jsafrane
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 13, 2019
@k8s-ci-robot k8s-ci-robot merged commit 7e4779d into kubernetes-csi:master Mar 13, 2019
andyzhangx added a commit to andyzhangx/external-provisioner that referenced this pull request Dec 16, 2023
b54c1ba49 Merge pull request kubernetes-csi#246 from xing-yang/go_1.21
5436c81e9 Change go version to 1.21.5
267b40e97 Merge pull request kubernetes-csi#244 from carlory/sig-storage
b42e5a2de nominate self (carlory) as kubernetes-csi reviewer
a17f536fc Merge pull request kubernetes-csi#210 from sunnylovestiramisu/sidecar
011033de2 Use set -x instead of die
5deaf667c Add wrapper script for sidecar release

git-subtree-dir: release-tools
git-subtree-split: b54c1ba49469d4d5d1b5d75285e8868ffe3d328f
kbsonlong pushed a commit to kbsonlong/external-provisioner that referenced this pull request Dec 29, 2023
Fixes ReconcileVA for non-migratable drivers
tyuchn added a commit to tyuchn/external-provisioner that referenced this pull request Mar 19, 2024
dc4d0ae20 Merge pull request kubernetes-csi#249 from jsafrane/use-go-version
e681b170e Use .go-version to get Kubernetes go version
b54c1ba49 Merge pull request kubernetes-csi#246 from xing-yang/go_1.21
5436c81e9 Change go version to 1.21.5
267b40e97 Merge pull request kubernetes-csi#244 from carlory/sig-storage
b42e5a2de nominate self (carlory) as kubernetes-csi reviewer
a17f536fc Merge pull request kubernetes-csi#210 from sunnylovestiramisu/sidecar
011033de2 Use set -x instead of die
5deaf667c Add wrapper script for sidecar release
f8c8cc4c7 Merge pull request kubernetes-csi#237 from msau42/prow
b36b5bfdc Merge pull request kubernetes-csi#240 from dannawang0221/upgrade-go-version
adfddcc9a Merge pull request kubernetes-csi#243 from pohly/git-subtree-pull-fix
c4650889d pull-test.sh: avoid "git subtree pull" error
7b175a1e2 Update csi-test version to v5.2.0
987c90ccd Update go version to 1.21 to match k/k
2c625d41d Add script to generate patch release notes
f9d5b9c05 Merge pull request kubernetes-csi#236 from mowangdk/feature/bump_csi-driver-host-path_version
b01fd5372 Bump csi-driver-host-path version up to v1.12.0
984feece4 Merge pull request kubernetes-csi#234 from siddhikhapare/csi-tools
1f7e60599 fixed broken links of testgrid dashboard

git-subtree-dir: release-tools
git-subtree-split: dc4d0ae20a3dcce17fbfc745fb1f1e3b10cd9644
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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants