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

[kong] merge staged 2.x changes into next #306

Merged
merged 8 commits into from
Mar 5, 2021
Merged

[kong] merge staged 2.x changes into next #306

merged 8 commits into from
Mar 5, 2021

Conversation

rainest
Copy link
Contributor

@rainest rainest commented Mar 4, 2021

What this PR does / why we need it:

Merges Helm 3-based CI and 2.x changes from stage/2.x into next

Which issue this PR fixes

(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged)

Special notes for your reviewer:

New branch since I messed up next merges in stage/2.x and created duplicate commits. This branch cherry-picks the actual new commits.

Previous PRs for non-CI features:
#256 (preserving generated admission webhook certificate across upgrades)
#303 (removing deprecated features)

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

  • PR is based off the current tip of the next branch and targets next, not main
  • New or modified sections of values.yaml are documented in the README.md
  • Title of the PR and commit headers start with chart name (e.g. [kong])

Travis Raines added 8 commits March 4, 2021 09:10
Upgrade CI actions for use with Helm 3.

The chart-testing action changed significantly in its 2.0.0 release and
the workflow is almost completely new. The revision is mostly their
current example:
https://github.com/helm/chart-testing-action/tree/v2.0.1#upgrading-from-v1xx

These changes no longer use the config files and exclude the original
timeout override. It doesn't look like we should need that since the
current default is longer than the old override (300s vs 200s).
Revert to an older version of Helm 3. 3.2.4 is the last version that
does not raise a linter failure on the older APIs we use with the
controller:
Kong/kubernetes-ingress-controller#801
If admission webhook certificates are already present on the cluster,
use them instead of generating a new certificate.

Fix #253
On review of the history behind this, we don't need this checksum if we
don't expect the certificate to change. We added it as a workaround for
failures caused by the certificate rotating on update:
helm/charts#20050
Removes the following deprecated Portal auth settings from values.yaml:
- enterprise.portal.session_conf_secret
- enterprise.portal.portal_auth

These are now normally set per-workspace via Kong Manager, and are
stored in Kong's database. The old environment variable settings are
still available, and are used as defaults when the workspace settings
are not explicitly set. They can still be set via the environment, by
setting portal_session_conf and portal_auth under env in values.yaml.

Fix #286
Removes the runMigrations setting from values.yaml. Migrations are now
controlled individually:

- migrations.init (runs "kong migrations bootstrap" on install)
- migrations.preUpgrade (runs "kong migrations up" during upgrades)
- migrations.postUpgrade (runs "kong migrations finish" during upgrades)

Fix #288
The admin API configuration could only set up a single port, either HTTP
or HTTPS. #72 added support for
dual-stack admin API configuraton using the same templates as other Kong
services.

Fix #287
Removes support for proxy ingress configuration with multiple hostnames.
#251 added a shared Ingress and
Service template for all Kong services, which only supports a single
hostname.

Fix #289
@rainest rainest requested a review from a team as a code owner March 4, 2021 17:21
Copy link
Contributor

@shaneutt shaneutt left a comment

Choose a reason for hiding this comment

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

LGTM 👍

My only concern would be testing this since we don't have a lot of automated testing around this yet, let me know your thoughts but otherwise no blockers.

@rainest rainest merged commit a19e4e5 into next Mar 5, 2021
@rainest rainest deleted the merge/2.x branch March 5, 2021 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants