Resolve conflict for "refactor(konnect): add SDK interface types and theirs mocks"(#507) #542
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* feat(cli): configurable certgen images
Add two new command line options to the manager.
-webhook-certificate-config-base-image string
The base image for the certgen Jobs. (default "registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.3.0")
-webhook-certificate-config-shell-image string
The shell image for the certgen Jobs. (default "busybox")
Those are optional. If you omit them the defaults will be used which are
the previous hard coded values.
Signed-off-by: Arpad Kunszt <[email protected]>
* feat(cli): cleanup code per review
Removed unnecessary variable assignments.
Signed-off-by: Arpad Kunszt <[email protected]>
* feat(cli): add CHANGELOG entry
Signed-off-by: Arpad Kunszt <[email protected]>
* feat(cli): unit tests handle new arguments
Signed-off-by: Arpad Kunszt <[email protected]>
* feat(cli): move new configuration into Config
Also created a constant for the shell image, so it is no more a hard
coded string hidden in the code.
Signed-off-by: Arpad Kunszt <[email protected]>
* feat(cli): added UT for the new arguments
The new unit test tests only if the command line arguments are set in
the configuration. The other cases, the default configuration, the
environmental variable handling are already tested in previous cases.
The test does not cover if the values from the configuration are
actually used but at the moment there are no tests for that part of the
code at all.
Signed-off-by: Arpad Kunszt <[email protected]>
---------
Signed-off-by: Arpad Kunszt <[email protected]>
Bumps [github.com/kong/kubernetes-configuration](https://github.com/kong/kubernetes-configuration) from 0.0.8 to 0.0.9. - [Commits](Kong/kubernetes-configuration@v0.0.8...v0.0.9) --- updated-dependencies: - dependency-name: github.com/kong/kubernetes-configuration dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…om 3.2.4 to 3.3.0 (#531) * chore(deps): bump github.com/kong/kubernetes-ingress-controller/v3 Bumps [github.com/kong/kubernetes-ingress-controller/v3](https://github.com/kong/kubernetes-ingress-controller) from 3.2.4 to 3.3.0. - [Release notes](https://github.com/kong/kubernetes-ingress-controller/releases) - [Changelog](https://github.com/Kong/kubernetes-ingress-controller/blob/main/CHANGELOG.md) - [Commits](Kong/kubernetes-ingress-controller@v3.2.4...v3.3.0) --- updated-dependencies: - dependency-name: github.com/kong/kubernetes-ingress-controller/v3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * chore: go mod tidy --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jakub Warczarek <[email protected]>
* feat: KongPluginBinding reconciler Signed-off-by: Mattia Lavacca <[email protected]> * chore: fix linter Signed-off-by: Mattia Lavacca <[email protected]> * chore: CHANGELOG updated Signed-off-by: Mattia Lavacca <[email protected]> * Update controller/konnect/ops_kongpluginbinding.go Co-authored-by: Grzegorz Burzyński <[email protected]> --------- Signed-off-by: Mattia Lavacca <[email protected]> Co-authored-by: Grzegorz Burzyński <[email protected]>
…v3.3.0 (#532) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…v3.3.1 (#534) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
) Bumps [github.com/kong/kubernetes-ingress-controller/v3](https://github.com/kong/kubernetes-ingress-controller) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/kong/kubernetes-ingress-controller/releases) - [Changelog](https://github.com/Kong/kubernetes-ingress-controller/blob/main/CHANGELOG.md) - [Commits](Kong/kubernetes-ingress-controller@v3.3.0...v3.3.1) --- updated-dependencies: - dependency-name: github.com/kong/kubernetes-ingress-controller/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#539) Bumps [github.com/Masterminds/sprig/v3](https://github.com/Masterminds/sprig) from 3.2.3 to 3.3.0. - [Release notes](https://github.com/Masterminds/sprig/releases) - [Changelog](https://github.com/Masterminds/sprig/blob/master/CHANGELOG.md) - [Commits](Masterminds/sprig@v3.2.3...v3.3.0) --- updated-dependencies: - dependency-name: github.com/Masterminds/sprig/v3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
….16.2 (#538) * chore(deps): update dependency kubernetes-sigs/controller-tools to v0.16.2 * chore: regenerate --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jakub Warczarek <[email protected]>
Bumps [github.com/gruntwork-io/terratest](https://github.com/gruntwork-io/terratest) from 0.47.0 to 0.47.1. - [Release notes](https://github.com/gruntwork-io/terratest/releases) - [Commits](gruntwork-io/terratest@v0.47.0...v0.47.1) --- updated-dependencies: - dependency-name: github.com/gruntwork-io/terratest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
randmonkey
changed the title
1 task
programmer04
approved these changes
Sep 3, 2024
randmonkey
added a commit
that referenced
this pull request
Sep 5, 2024
* refactor(konnect): add SDK interface types for each entity type * tests: add mockery for Konnect SDK * tests: add mocks for KongService SDK * Resolve conflict for "refactor(konnect): add SDK interface types and theirs mocks"(#507) (#542) * feat(cli): configurable certgen images (#516) * feat(cli): configurable certgen images Add two new command line options to the manager. -webhook-certificate-config-base-image string The base image for the certgen Jobs. (default "registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.3.0") -webhook-certificate-config-shell-image string The shell image for the certgen Jobs. (default "busybox") Those are optional. If you omit them the defaults will be used which are the previous hard coded values. Signed-off-by: Arpad Kunszt <[email protected]> * feat(cli): cleanup code per review Removed unnecessary variable assignments. Signed-off-by: Arpad Kunszt <[email protected]> * feat(cli): add CHANGELOG entry Signed-off-by: Arpad Kunszt <[email protected]> * feat(cli): unit tests handle new arguments Signed-off-by: Arpad Kunszt <[email protected]> * feat(cli): move new configuration into Config Also created a constant for the shell image, so it is no more a hard coded string hidden in the code. Signed-off-by: Arpad Kunszt <[email protected]> * feat(cli): added UT for the new arguments The new unit test tests only if the command line arguments are set in the configuration. The other cases, the default configuration, the environmental variable handling are already tested in previous cases. The test does not cover if the values from the configuration are actually used but at the moment there are no tests for that part of the code at all. Signed-off-by: Arpad Kunszt <[email protected]> --------- Signed-off-by: Arpad Kunszt <[email protected]> * chore(deps): bump github.com/kong/kubernetes-configuration (#523) Bumps [github.com/kong/kubernetes-configuration](https://github.com/kong/kubernetes-configuration) from 0.0.8 to 0.0.9. - [Commits](Kong/kubernetes-configuration@v0.0.8...v0.0.9) --- updated-dependencies: - dependency-name: github.com/kong/kubernetes-configuration dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump github.com/kong/kubernetes-ingress-controller/v3 from 3.2.4 to 3.3.0 (#531) * chore(deps): bump github.com/kong/kubernetes-ingress-controller/v3 Bumps [github.com/kong/kubernetes-ingress-controller/v3](https://github.com/kong/kubernetes-ingress-controller) from 3.2.4 to 3.3.0. - [Release notes](https://github.com/kong/kubernetes-ingress-controller/releases) - [Changelog](https://github.com/Kong/kubernetes-ingress-controller/blob/main/CHANGELOG.md) - [Commits](Kong/kubernetes-ingress-controller@v3.2.4...v3.3.0) --- updated-dependencies: - dependency-name: github.com/kong/kubernetes-ingress-controller/v3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * chore: go mod tidy --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jakub Warczarek <[email protected]> * `KongPluginBinding` reconciler (#513) * feat: KongPluginBinding reconciler Signed-off-by: Mattia Lavacca <[email protected]> * chore: fix linter Signed-off-by: Mattia Lavacca <[email protected]> * chore: CHANGELOG updated Signed-off-by: Mattia Lavacca <[email protected]> * Update controller/konnect/ops_kongpluginbinding.go Co-authored-by: Grzegorz Burzyński <[email protected]> --------- Signed-off-by: Mattia Lavacca <[email protected]> Co-authored-by: Grzegorz Burzyński <[email protected]> * chore(deps): update kong/kubernetes-ingress-controller docker tag to v3.3.0 (#532) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update kong/kubernetes-ingress-controller docker tag to v3.3.1 (#534) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Add watch for KongPlugin and KongClusterPlugin in KongPluginBinding controller (#535) * chore(deps): bump github.com/kong/kubernetes-ingress-controller/v3 (#536) Bumps [github.com/kong/kubernetes-ingress-controller/v3](https://github.com/kong/kubernetes-ingress-controller) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/kong/kubernetes-ingress-controller/releases) - [Changelog](https://github.com/Kong/kubernetes-ingress-controller/blob/main/CHANGELOG.md) - [Commits](Kong/kubernetes-ingress-controller@v3.3.0...v3.3.1) --- updated-dependencies: - dependency-name: github.com/kong/kubernetes-ingress-controller/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump github.com/Masterminds/sprig/v3 in /hack/generators (#539) Bumps [github.com/Masterminds/sprig/v3](https://github.com/Masterminds/sprig) from 3.2.3 to 3.3.0. - [Release notes](https://github.com/Masterminds/sprig/releases) - [Changelog](https://github.com/Masterminds/sprig/blob/master/CHANGELOG.md) - [Commits](Masterminds/sprig@v3.2.3...v3.3.0) --- updated-dependencies: - dependency-name: github.com/Masterminds/sprig/v3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): update dependency kubernetes-sigs/controller-tools to v0.16.2 (#538) * chore(deps): update dependency kubernetes-sigs/controller-tools to v0.16.2 * chore: regenerate --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jakub Warczarek <[email protected]> * chore(deps): bump github.com/gruntwork-io/terratest (#541) Bumps [github.com/gruntwork-io/terratest](https://github.com/gruntwork-io/terratest) from 0.47.0 to 0.47.1. - [Release notes](https://github.com/gruntwork-io/terratest/releases) - [Commits](gruntwork-io/terratest@v0.47.0...v0.47.1) --- updated-dependencies: - dependency-name: github.com/gruntwork-io/terratest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * update golangci configuration --------- Signed-off-by: Arpad Kunszt <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Mattia Lavacca <[email protected]> Co-authored-by: akunszt <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jakub Warczarek <[email protected]> Co-authored-by: Mattia Lavacca <[email protected]> Co-authored-by: Grzegorz Burzyński <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix lint * replace KonnnectControlPlane to KonnectGatewayControlPlane --------- Signed-off-by: Arpad Kunszt <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Mattia Lavacca <[email protected]> Co-authored-by: Tao Yi <[email protected]> Co-authored-by: akunszt <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jakub Warczarek <[email protected]> Co-authored-by: Mattia Lavacca <[email protected]> Co-authored-by: Grzegorz Burzyński <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Merge
mainto #507 and resolve conflicts.Which issue this PR fixes
Part of #447
Special notes for your reviewer:
PR Readiness Checklist:
Complete these before marking the PR as
ready to review:CHANGELOG.mdrelease notes have been updated to reflect significant changes