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

Merge gardener/gardener-extensions@v1.6.0 #2141

Merged
merged 4 commits into from
Apr 7, 2020
Merged

Merge gardener/gardener-extensions@v1.6.0 #2141

merged 4 commits into from
Apr 7, 2020

Conversation

rfranzke
Copy link
Member

@rfranzke rfranzke commented Apr 6, 2020

What this PR does / why we need it:
This PR merges the gardener/gardener-extensions repository into gardener/gardener, based on v1.6.0.
After the extension repository split the indirection with gardener/gardener-extensions does not have any benefit anymore. Instead, it makes it even harder for extensions to keep up to date.
As the extensions contract is maintained in g/g it also makes sense to maintain the extensions library in g/g now.

Which issue(s) this PR fixes:
Fixes #1708
Fixes #1660

Special notes for your reviewer:

  • I harmonized the hack scripts
  • There will be only one verify step in the CI build - it does extended checks and tests the code + outputs coverage
  • The verify step is not done as part of the Dockerfile due to Concourse limitations with building multi-stage Dockerfiles.

Release note:

The gardener/gardener-extensions repository was merged into this repository based on v1.6.0. Please remove your `github.com/gardener/gardener-extensions` Golang dependency in favour of `github.com/gardener/gardener`, and adapt your `hack` script call invocations if necessary.
The `./hack/dev-setup-extensions` script was removed in favour of the [Gardener Extensions Manager](https://github.com/gardener/gem).

@rfranzke
Copy link
Member Author

rfranzke commented Apr 6, 2020

Build is failing because CI/CD is not yet adapted. See https://concourse.ci.gardener.cloud/teams/gardener/pipelines/gardener-rc/jobs/rc-head-update-job/builds/14 for a successful build.

Copy link
Member

@timebertt timebertt left a comment

Choose a reason for hiding this comment

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

Looks good in general, but couldn't look through it all.

Copy link
Member

@timuthy timuthy left a comment

Choose a reason for hiding this comment

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

Nice PR! 👍 Just a few questions.

@rfranzke
Copy link
Member Author

rfranzke commented Apr 6, 2020

Thanks for your reviews, please check it again! :)

timebertt
timebertt previously approved these changes Apr 6, 2020
Copy link
Member

@timebertt timebertt left a comment

Choose a reason for hiding this comment

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

Fine, for me now :)
/lgtm

In the release note, what do you mean by "Please update to Golang dependencies"?

Copy link
Member

@ialidzhikov ialidzhikov left a comment

Choose a reason for hiding this comment

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

/lgtm

@rfranzke
Copy link
Member Author

rfranzke commented Apr 7, 2020

Thanks colleagues, will merge and adapt the pipeline definition now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add hack/check-generate.sh Add golangci-lint checks
7 participants