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

migrate operator config CRD to openshift/api/operator/v1 #58

Merged
merged 4 commits into from
Feb 4, 2019

Conversation

sallyom
Copy link
Contributor

@sallyom sallyom commented Feb 2, 2019

Migrate operator config CRD
see:

@enj
The above merged, this PR has 3 commits:

  1. pulls updates deps to pull in changes in client-go (hack/update-deps.sh)
  2. updates config CRD to new gvr
  3. updates import paths
  4. removes codegen logic

/hold

@openshift-ci-robot openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 2, 2019
@enj
Copy link
Contributor

enj commented Feb 2, 2019

After client-go generation, do a bump(*), drop old type and generated code, drop old CRD, update old CR to new GVR.

@openshift-ci-robot openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 2, 2019
@sallyom sallyom changed the title make new openshift/api/operator CRD migrate operator config CRD to openshift/api/operator/v1 Feb 2, 2019
@enj
Copy link
Contributor

enj commented Feb 3, 2019

@sallyom

  1. drop old type and generated code -> means the pkg/apis and pkg/generated folder needs to be deleted and import paths fixed - we can deal with the Makefile and shell script changes later
  2. update old CR to new GVR -> update defaultOperatorConfig and its GVR (along with the updates config CRD to new gvr - commit 1 that you have already done
  3. As an aside, the bump(*) should be the first commit

@sallyom sallyom force-pushed the move-crds branch 2 times, most recently from 149e08c to 4d0ccec Compare February 4, 2019 15:11
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apimachinery/pkg/util/sets"
)

const hashAnnotation = authv1alpha1.GroupName + "/rvs-hash"
var hashAnnotation = operatorv1.GroupName + "/rvs-hash"
Copy link
Contributor

Choose a reason for hiding this comment

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

@sallyom as a followup, make operatorv1.GroupName a const in openshift/api and then undo this change.

@enj
Copy link
Contributor

enj commented Feb 4, 2019

/lgtm

Tested with htpasswd

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 4, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enj, sallyom

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 4, 2019
@enj
Copy link
Contributor

enj commented Feb 4, 2019

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 4, 2019
@openshift-merge-robot openshift-merge-robot merged commit 502b417 into openshift:master Feb 4, 2019
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. 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.

None yet

4 participants