Skip to content
This repository has been archived by the owner on Oct 21, 2020. It is now read-only.

Update all k8s.io dependencies to 1.8.2 and add support for Retain reclaim policy to lib/controller #419

Merged
merged 4 commits into from
Oct 30, 2017

Conversation

wongma7
Copy link
Contributor

@wongma7 wongma7 commented Oct 24, 2017

this is a continuation of #392

snapshots needs some code changes because of changes to kuberentes' internal API.

other than that, we are fine.

@xingzhou we can contniue work in #392 if I submit a PR against your branch, or we can fix it here. up to you!

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 24, 2017
@wongma7
Copy link
Contributor Author

wongma7 commented Oct 24, 2017

$ make snapshot
cd snapshot; \
make
make[1]: Entering directory '/home/mawong/src/github.com/kubernetes-incubator/external-storage/snapshot'
go build -o _output/bin/snapshot-controller cmd/snapshot-controller/snapshot-controller.go
# github.com/kubernetes-incubator/external-storage/snapshot/pkg/apis/crd/v1
pkg/apis/crd/v1/register.go:52: cannot use VolumeSnapshot literal (type *VolumeSnapshot) as type runtime.Object in argument to scheme.AddKnownTypes:
	*VolumeSnapshot does not implement runtime.Object (missing DeepCopyObject method)
pkg/apis/crd/v1/register.go:53: cannot use VolumeSnapshotList literal (type *VolumeSnapshotList) as type runtime.Object in argument to scheme.AddKnownTypes:
	*VolumeSnapshotList does not implement runtime.Object (missing DeepCopyObject method)
pkg/apis/crd/v1/register.go:54: cannot use VolumeSnapshotData literal (type *VolumeSnapshotData) as type runtime.Object in argument to scheme.AddKnownTypes:
	*VolumeSnapshotData does not implement runtime.Object (missing DeepCopyObject method)
pkg/apis/crd/v1/register.go:55: cannot use VolumeSnapshotDataList literal (type *VolumeSnapshotDataList) as type runtime.Object in argument to scheme.AddKnownTypes:
	*VolumeSnapshotDataList does not implement runtime.Object (missing DeepCopyObject method)
pkg/apis/crd/v1/types.go:292: cannot use &vd.Metadata (type *"github.com/kubernetes-incubator/external-storage/vendor/k8s.io/apimachinery/pkg/apis/meta/v1".ListMeta) as type "github.com/kubernetes-incubator/external-storage/vendor/k8s.io/apimachinery/pkg/apis/meta/v1".List in return argument
pkg/apis/crd/v1/types.go:312: cannot use &vd.Metadata (type *"github.com/kubernetes-incubator/external-storage/vendor/k8s.io/apimachinery/pkg/apis/meta/v1".ListMeta) as type "github.com/kubernetes-incubator/external-storage/vendor/k8s.io/apimachinery/pkg/apis/meta/v1".List in return argument

I will work on fixing this issue. everything else seems okay.

@xingzhou
Copy link
Contributor

@wongma7, does this PR contain all the changes I made in #392?

@wongma7
Copy link
Contributor Author

wongma7 commented Oct 25, 2017 via email

@xingzhou
Copy link
Contributor

yeap, is there any reason that we need to share dependency with snapshot? to me, snapshot is some kind of independent code, which will be compiled on its own

@sbezverk
Copy link
Contributor

@wongma7 it seems going with 1.8.1 tags is not enough for some newer api objects as in the latest CI failure for CephFS.

@wongma7
Copy link
Contributor Author

wongma7 commented Oct 28, 2017

I will squash the first 3 commits @xingzhou

Then we can get this merged finally. Sorry for the month-long delay everybody.

@wongma7 wongma7 changed the title WIP/ test Support Retain reclaim policy in external storage and update all k8s.io dependencies to 1.8.1 Update all k8s.io dependencies to 1.8.2 and add support for Retain reclaim policy Oct 28, 2017
@wongma7 wongma7 changed the title Update all k8s.io dependencies to 1.8.2 and add support for Retain reclaim policy Update all k8s.io dependencies to 1.8.2 and add support for Retain reclaim policy to lib/controller Oct 28, 2017
@wongma7
Copy link
Contributor Author

wongma7 commented Oct 28, 2017

Forgot to say, for the snapshot changes I ran

$ ./generate-groups.sh deepcopy github.com/kubernetes-incubator/external-storage/snapshot/pkg/apis github.com/kubernetes-incubator/external-storage/snapshot/pkg/apis "crd:v1"

from https://github.com/kubernetes/code-generator to get zz_generated.deepcopy.go. And manually fixed the broken ones and put into deepcopy.go. (The structs that have a member of external type i.e. from core_v1)

@sbezverk
Copy link
Contributor

@wongma7 if it is possible, could you please add recent merged api change to support RBDPersistentVolumeSource which was added last week? In this case RBD provisioner can be refactored to use it.

@wongma7
Copy link
Contributor Author

wongma7 commented Oct 30, 2017

nobody wants to review, merging

@wongma7 wongma7 merged commit 503611f into kubernetes-retired:master Oct 30, 2017
@wongma7 wongma7 added lgtm Indicates that a PR is ready to be merged. area/ceph/cephfs and removed area/ceph/cephfs labels Oct 30, 2017
@tsmetana
Copy link
Contributor

Sorry for the slow response: I was AFK for the past few days... I think it's OK to merge this anyway. Thanks.

@sbezverk
Copy link
Contributor

@wongma7 Tested for RBD, the change looks good, now SecretReference is available. I still see the issue for new RBDPersistentVolumeSource though, I guess it will be addressed in the next PR.

pkg/provision/provision.go:114: undefined: "github.com/kubernetes-incubator/external-storage/vendor/k8s.io/api/core/v1".RBDPersistentVolumeSource
Makefile:27: recipe for target 'build' failed

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area/ceph/cephfs area/lib area/snapshot cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm 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