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

Feature/jdb/strict merge no ff #2850

Merged
merged 69 commits into from
Jan 19, 2022

Conversation

joedborg
Copy link
Contributor

Merge latest changes into strict branch.

johnlettman and others added 30 commits July 27, 2021 11:32
* Move storage-dir argument to k8s-dqlite

* Fix the config values

* Remove empty line
Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.5 to 2.4.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v2.3.5...v2.4.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Set `kube-system` as the default namespace

* Test mutating webhook features

Signed-off-by: Elias Koromilas <elias.koromilas@gmail.com>
Rename `build` to `check-formatting`.  This helps when running locally with `act`.
Add Ingress for Kubernetes Dashboard addon (#906)
- Disable profiling (--profiling=false)
- Reduce event TTL to 5 minutes (--event-ttl=5m)
Add note and workaround for nip.io in tests
Upgrade linkerd to version 2.11.1
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.2.2 to 2.3.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@v2.2.2...v2.3.0)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
neoaggelos and others added 18 commits December 1, 2021 15:57
* Allow kube-proxy to change nf_conntrack_max on lxc

* If you detect we are on lxc do not try set any conntrack params
* fix ingress rbac so it can acquire lock

* upgrade nginx ingress to v1.1.0 and update the rolebinding to use only  resourceName
Bumps [carlosperate/download-file-action](https://github.com/carlosperate/download-file-action) from 1.0.3 to 1.1.0.
- [Release notes](https://github.com/carlosperate/download-file-action/releases)
- [Commits](carlosperate/download-file-action@v1.0.3...v1.1.0)

---
updated-dependencies:
- dependency-name: carlosperate/download-file-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Konstantinos Tsakalozos <konstantinos.tsakalozos@canonical.com>
* Replace 'storage' with 'hostpath-storage'
@joedborg joedborg requested a review from knkski as a code owner January 18, 2022 14:41
@joedborg joedborg self-assigned this Jan 18, 2022
@joedborg joedborg changed the base branch from master to feature/jdb/strict January 18, 2022 14:41
@joedborg
Copy link
Contributor Author

@ktsakalozos @neoaggelos I think the memory gating might be breaking this. It seems fine if I manually do snap start microk8s after install and connecting interfaces so perhaps the memory gating is breaking https://github.com/ubuntu/microk8s/blob/feature/jdb/strict/microk8s-resources/actions/common/utils.sh#L671 and its references in https://github.com/ubuntu/microk8s/blob/feature/jdb/strict/snap/hooks/configure#L12 and https://github.com/ubuntu/microk8s/blob/feature/jdb/strict/snap/hooks/configure#L630

Any chance you could have a quick look? Thanks.

@joedborg joedborg merged commit b12ae07 into feature/jdb/strict Jan 19, 2022
@joedborg joedborg deleted the feature/jdb/strict-merge-no-ff branch January 19, 2022 18:32
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.