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 main into next #971

Merged
merged 23 commits into from
Dec 3, 2020
Merged

Merge main into next #971

merged 23 commits into from
Dec 3, 2020

Conversation

rainest
Copy link
Contributor

@rainest rainest commented Dec 3, 2020

What this PR does / why we need it:
Merges main into next. We need that to proceed with adding integration tests to #863 (and should do it anyway).

Travis Raines and others added 23 commits October 5, 2020 11:34
fixed links to latest bintray 'master' builds. the header still says "Master branch builds". Not sure what to change that to.
fix links to bintray builds
service.Name for this point is kong.String('') and it's pointer to string. As a result in logs I can see only RAM address:

`time="2020-10-20T12:39:52Z" level=warning msg="skipping service - getServiceEndpoints failed: no suitable port found" component=store service_name=0xc000bacaf0
time="2020-10-20T12:39:52Z" level=warning msg="skipping service - getServiceEndpoints failed: no suitable port found" component=store service_name=0xc000bac9a0`

And after fix:
`time="2020-10-20T14:35:02Z" level=warning msg="skipping service - getServiceEndpoints failed: no suitable port found" component=store service_name=default.kong-ingress-add-gcp-stg-zendesk-sso-gcp-stg-root.80
time="2020-10-20T14:35:02Z" level=warning msg="skipping service - getServiceEndpoints failed: no suitable port found" component=store service_name=default.kong-ingress-add-gcp-stg-fms-gcp-stg.80`
Use an arbitrary number (3) for the verify depth. This is fine for the
vast majority of certificate chains. The default (1) is a bit low, and
causes issues with multiple intermediates. The current value, "on", is
definitely wrong, as this setting only accepts a number.
Change Enterprise manifests from kong-enterprise-k8s to
kong-enterprise-edition. Update tag to current latest 2.1 patch.
What this PR does / why we need it:
Several pieces of documentation still used the old plugins.konghq.com annotation. This change updates those to use the modern konghq.com/plugins resource.

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

Special notes for your reviewer:
Fixed several instances after the initial report of the one. Hurray for sed!

Performed a cursory check through the docs.konghq.com repo to see if we have any of the old annotation there; we do not.
What this PR does / why we need it:
Updates CONTRIBUTING to instruct contributors to use Golang 1.15.

Special notes for your reviewer:
Updated following a review of community resources and realizing that this looked outdated re #816
fixes #694 

- makes CI build a local KIC image from HEAD
- if on `main` or `next`: pushes to bintray. Can (or, maybe, should) be extended to all pushes
- spins up a local microk8s cluster
- pushes the local KIC to the local image registry
- runs an instance of KIC
- runs a set of tests: applying a bunch of manifests, waiting (open loop - `sleep 6`) for KIC to do its work, asserting on `curl` results
    - There are several possible ways to mitigate the `sleep` but none of them is perfect:
        - watch the `status` field of created resources
        - watch KIC logs for a successful/failed sync
        - watch the Kong Admin API `/config` endpoint

* test(integration): implement harness and basic tests

* test(integration): run on ci

* chore(test): improve test cleanup

* chore(test): switch from microk8s to kind

* chore(makefile): define target `integration-test`

* test(integration): patch instead of sed, disable anonymous reports

* test(e2e): replace kubectl patch with kustomization

* test(e2e): bump kubectl wait timeout to account for slow pulls

* test(e2e): remove unused PROXY_IP variable

* test(e2e): write README

* test(e2e): add shebang to verify.sh files

* test(e2e): gitignore leftover stuff
Fixes the build failure https://github.com/Kong/kubernetes-ingress-controller/actions/runs/342391558 .

The reason for the failure is that git rev-parse works only if the git repository has been cloned. This is not necessary there - GITHUB_REF gives us the information we need.
Update cert-manager integration guide to reflect current API versions and
ingress class requirements.
Add a CI check to confirm whether go modules are tidy. If they are not
tidy, complain!
Per Kong 2.2 changelog, this shouldn't be a breaking change.
**What this PR does / why we need it**:
KIC version of Kong/charts#227
**What this PR does / why we need it**:
CI is sad; this makes it not sad.

**Special notes for your reviewer**:

push-public has
```
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/next'
```
so this doesn't actually execute until the commit lands in main. This should suffice to confirm it gets what we want:

```
$ export GITHUB_REF="refs/heads/main"   
$ REF=`sed -re "s/^refs\/[a-z]+\///" <<< $GITHUB_REF`; echo $REF 
main
```
IDK much about bash's built-in pattern matching language, but brief research suggests it doesn't support the `+` operator or the PCRE-style classes we're using. sed definitely does, so may as well use that.
This PR adds clarifying documentation to Setting up custom plugins, defining details that are necessary for successful installation.

* Updates custom plugin documentation for clarity

* apply review suggestion

Co-authored-by: Michał Flendrich <m.flendrich@gmail.com>
Co-authored-by: Michał Flendrich <michal@flendrich.pro>
Reject credentials that lack fields necessary for deck processing. We
handle this in the controller before passing them to deck because deck
cannot currently report the individual credential at fault, and will
panic when it encounters them.
@mflendrich mflendrich merged commit aab9869 into next Dec 3, 2020
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.

7 participants