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 2 #2820

Merged
merged 70 commits into from Jan 13, 2022

Conversation

joedborg
Copy link
Contributor

@joedborg joedborg commented Jan 4, 2022

Trying again to merge master into strict.

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>
ktsakalozos and others added 14 commits November 29, 2021 14:32
Co-authored-by: Angelos Kolaitis <angelos.kolaitis@canonical.com>
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@v2.3.0...v2.3.1)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Replace deprecated network tools in inspect script (#2657)

Use networks tools from iproute2 (ip addr + ss) instead of
net-tools (ifconfig, netstat)

* Replacement of deprecated net-tools to iproute2 tools

It removes the use of the deprecated ifconfig and netstat tools
notably when performing enabling/disabling host-access action and
inside common/utils functions
* Allow kube-proxy to change nf_conntrack_max on lxc

* If you detect we are on lxc do not try set any conntrack params
@joedborg joedborg self-assigned this Jan 4, 2022
joedborg and others added 12 commits January 4, 2022 16:25
* 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>
…microk8s into feature/jdb/strict-merge-no-ff-2
@joedborg joedborg merged commit 8091ab5 into feature/jdb/strict Jan 13, 2022
@joedborg joedborg deleted the feature/jdb/strict-merge-no-ff-2 branch January 13, 2022 13:53
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.

None yet