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.

Sign up for GitHub

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

Jump to bottom

switch to go modules, standard makefile, and bump #177

Merged
merged 1 commit into from Apr 9, 2020
Merged

switch to go modules, standard makefile, and bump #177

merged 1 commit into from Apr 9, 2020

Conversation

sjenning
Copy link
Contributor

@sjenning sjenning commented Apr 7, 2020

Unfortunately, this ended up being a huge PR.

The things it does:

  • moves from dep managed vendor tree to Go modules
    • involves adding dependencymagnet to get tools in vendor
    • small change to azure unit tests due to sdk bump
  • moves to a kube 1.17.2 base
  • moves to standard Makefile (https://github.com/openshift/build-machinery-go)
  • moves to conventional bindata in repo root
  • rename binary to cloud-credential-operator to conform to standard Makefile and debugability (manager in the ps output vs cloud-credential-operator)
  • split out operator subcommand to conform to convention on operators that have a render mode as well
  • Rework Dockerfile to conform to convention
  • remove kustomize from flow

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 7, 2020
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 7, 2020
@sjenning
Copy link
Contributor Author

sjenning commented Apr 7, 2020 •
edited

might have to adjust prow in the short term to get this in as the make targets have changed meh, might be easier just to add those targets back, then adjust prow, then remove the old targets.

@sjenning sjenning mentioned this pull request Apr 7, 2020
Merged
dgoodwin
dgoodwin reviewed Apr 8, 2020
View reviewed changes
Makefile Show resolved Hide resolved
Makefile Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
Makefile
$(call add-crd-gen,manifests,$(CRD_APIS),./manifests,./manifests)

update-codegen: update-codegen-crds
.PHONY: update-codegen
Copy link
Contributor

Choose a reason for hiding this comment

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

What is the difference between update-codegen and update-generated mentioned in one of the comments above?

manifests/05_deployment.yaml Show resolved Hide resolved
pkg/dependencymagnet/doc.go Show resolved Hide resolved
pkg/operator/controller.go Show resolved Hide resolved
@sjenning sjenning force-pushed the go-modules-and-bump branch 2 times, most recently from d666ecb to faf0795 Compare April 8, 2020 17:21
@sjenning sjenning force-pushed the go-modules-and-bump branch 3 times, most recently from 585dc06 to 17aec82 Compare April 8, 2020 20:55
@sjenning
Copy link
Contributor Author

sjenning commented Apr 8, 2020

/test e2e-openstack

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 8, 2020 •
edited

@sjenning: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-openstack 17aec82 link /test e2e-openstack

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

@sjenning
Copy link
Contributor Author

sjenning commented Apr 8, 2020

Great, e2e-aws passed. Pushed once more because I failed to update the bindata on the last push. I'll add a make verify test in prow after this merges.

Ready for review/lgtm/approve.

joelddiaz
joelddiaz reviewed Apr 8, 2020
View reviewed changes
Copy link
Contributor

@joelddiaz joelddiaz left a comment

Choose a reason for hiding this comment

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

Thanks for the work. This looks good for me, but as the PR is large, we should also get @dgoodwin to sign off.

manifests/05_deployment.yaml
@@ -203,7 +203,7 @@ spec:
echo "Copying system trust bundle"
cp -f /var/run/configmaps/trusted-ca-bundle/tls-ca-bundle.pem /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
fi
exec /root/manager --log-level=debug
exec /usr/bin/cloud-credential-operator operator --log-level=debug
Copy link
Contributor

Choose a reason for hiding this comment

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

down below, the container name of 'manager' might make better sense as 'cloud-credential-operator' (or just operator)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sure, i'll do this in a follow on PR

pkg/cmd/render/render.go
- --kubeconfig=/etc/kubernetes/secrets/kubeconfig
image: %s
imagePullPolicy: IfNotPresent
name: manager
Copy link
Contributor

Choose a reason for hiding this comment

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

same comment about the name of the container name of 'manager'

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sure, i'll do this in a follow on PR

@sjenning sjenning changed the title WIP: switch to go modules, standard makefile, and bump switch to go modules, standard makefile, and bump Apr 9, 2020
@openshift-ci-robot openshift-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 Apr 9, 2020
@dgoodwin
Copy link
Contributor

dgoodwin commented Apr 9, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 9, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dgoodwin, sjenning

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 Apr 9, 2020
@openshift-merge-robot openshift-merge-robot merged commit 40ac6c1 into openshift:master Apr 9, 2020
This was referenced Apr 9, 2020
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dgoodwin dgoodwin dgoodwin left review comments

@joelddiaz joelddiaz joelddiaz left review comments

@csrwng csrwng Awaiting requested review from csrwng

@staebler staebler Awaiting requested review from staebler

Assignees

@dgoodwin dgoodwin

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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@sjenning @openshift-ci-robot @dgoodwin @joelddiaz @openshift-merge-robot