Commit Graph

1227 Commits

Author SHA1 Message Date
Darren Shepherd
2f5ee914f9 Add supervisor port
In k3s today the kubernetes API and the /v1-k3s API are combined into
one http server.  In rke2 we are running unmodified, non-embedded Kubernetes
and as such it is preferred to run k8s and the /v1-k3s API on different
ports.  The /v1-k3s API port is called the SupervisorPort in the code.

To support this separation of ports a new shim was added on the client in
then pkg/agent/proxy package that will launch two load balancers instead
of just one load balancer.  One load balancer for 6443 and the other
for 9345 (which is the supervisor port).
2020-05-05 15:54:51 -07:00
Darren Shepherd
1d05e99769
Merge pull request #1752 from ibuildthecloud/disable-ccm
Don't write ccm.yaml if --disable-cloud-controller is set
2020-05-05 15:11:10 -07:00
Darren Shepherd
70ddc799bd
Merge pull request #1691 from ibuildthecloud/staticpod
Suppport static pods at ${datadir}/agent/staticpods
2020-05-05 14:35:45 -07:00
Darren Shepherd
341895c322 Don't write ccm.yaml if --disable-cloud-controller is set 2020-05-05 13:01:52 -07:00
Darren Shepherd
8c7fbe3dde Suppport static pods at ${datadir}/agent/pod-manifests 2020-05-05 12:43:47 -07:00
Erik Wilson
39c3854648
Merge pull request #1720 from ilknarf/master
remove redundant Sprintf
2020-05-04 20:50:58 -07:00
Erik Wilson
c71561129e
Merge pull request #1716 from ibuildthecloud/debugpublic
Make debug variable public to be used by wrapper programs
2020-05-04 20:50:36 -07:00
Erik Wilson
6d785b8627
Merge pull request #1736 from oliviermichaelis/replace-deprecated
Replace deprecated option
2020-05-04 20:29:53 -07:00
Erik Wilson
c941e1d0bb
Merge pull request #1695 from ibuildthecloud/kubeproxy
Add ability to disable kubeproxy
2020-05-04 20:26:22 -07:00
Erik Wilson
df1725cb06
Merge pull request #1694 from ibuildthecloud/inittwice
Allow InitLogging to be called twice
2020-05-04 20:22:04 -07:00
Erik Wilson
2fb5bad3e8
Merge pull request #1704 from ibuildthecloud/x509-admin
No longer use basic auth for default admin account
2020-05-04 20:21:12 -07:00
Erik Wilson
21eabd902b
Merge pull request #1693 from ibuildthecloud/disableditem
Move disabled items to a const to keep more consistency
2020-05-04 20:16:42 -07:00
Erik Wilson
21266bab7e
Merge pull request #1692 from ibuildthecloud/err
Check for error on mkdir
2020-05-04 20:16:20 -07:00
Erik Wilson
ed8cd9250b
Merge pull request #1690 from ibuildthecloud/flannel
Only need to resolve the path of host-local if Flannel is enabled
2020-05-04 20:15:59 -07:00
Erik Wilson
47bb0939e6
Merge pull request #1611 from Dirbaio/master
Correctly quote auth strings in containerd config. For #1610
2020-05-04 19:27:17 -07:00
Erik Wilson
c769bb115a
Merge pull request #1500 from joakimr-axis/joakimr-axis_package-cli
package-cli: Remove redundant rm -rf build/data
2020-05-04 19:24:21 -07:00
Erik Wilson
698e444a03
Merge pull request #1742 from dweomer/runc/replace-rc10
runc: bump to rc10
2020-05-04 18:36:06 -07:00
Jacob Blain Christen
4949da46f1 runc: bump to rc10
- [CVE-2019-19921](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19921)

See https://github.com/opencontainers/runc/releases/tag/v1.0.0-rc10
2020-05-04 18:11:25 -07:00
Erik Wilson
c900a251a2
Merge pull request #1745 from erikwilson/upgrade-helm-controller
Upgrade helm-controller v0.6.0
2020-05-04 17:52:25 -07:00
Erik Wilson
cafd10eb50 Upgrade helm-controller v0.6.0 2020-05-04 17:27:21 -07:00
Erik Wilson
202a2ae482 Check for correct go vendoring 2020-05-04 17:26:05 -07:00
Erik Wilson
a013f7dda5
Merge pull request #1740 from erikwilson/bump-cri
Bump cri to 1.3.0-k3s6
2020-05-04 10:39:58 -07:00
Erik Wilson
c50e261408
Merge pull request #1739 from briandowns/README_update
update readme
2020-05-04 10:39:46 -07:00
Erik Wilson
82cb820a1a
Merge pull request #1737 from erikwilson/bump-k3s-root
Bump k3s-root to 0.4.1
2020-05-04 10:39:26 -07:00
Erik Wilson
e0bf7a053a Bump cri to 1.3.0-k3s6 2020-05-04 10:11:48 -07:00
Brian Downs
08fec686fd update readme 2020-05-04 10:11:42 -07:00
Darren Shepherd
470ffca5d7 Update README, fix out of date information 2020-05-04 09:51:25 -07:00
David Nuzik
de48f0c43d
Merge pull request #1730 from geerlingguy/1729-ansible-changed
Fixes #1729: Use 'is changed' instead of non-existent changed filter.
2020-05-04 09:36:38 -07:00
David Nuzik
b6fe30ac20
Merge pull request #1731 from geerlingguy/fix-ansible-readme-typo
Fix typo in Ansible README file scp command.
2020-05-04 09:32:32 -07:00
Erik Wilson
5d77f24e7e Bump k3s-root to 0.4.1 2020-05-04 09:18:35 -07:00
omichaelis
e629fd381d
Replace deprecated option
The option --no-deploy was deprecated by
0374c4f63d
and is now replaced in the install.sh documentation by --disable

Signed-off-by: omichaelis <38879457+oliviermichaelis@users.noreply.github.com>
2020-05-03 18:26:59 +02:00
Jeff Geerling
3fef74bcb9 Fix typo in Ansible README file scp command. 2020-05-01 23:02:08 -05:00
Jeff Geerling
27215a5ec0 Fixes #1729: Use 'is changed' instead of non-existent changed filter. 2020-05-01 22:42:42 -05:00
Frank
a18d94e5f9 remove redundant Sprintf 2020-04-30 10:48:12 -05:00
Darren Shepherd
56770ff2cc Make debug variable public to be used by wrapper programs 2020-04-29 11:37:59 -07:00
Darren Shepherd
3c8e0b4157 No longer use basic auth for default admin account 2020-04-28 16:01:33 -07:00
Darren Shepherd
690a4ca7a4
Merge pull request #1697 from ibuildthecloud/dapper-fix
$ must be escaped in Makefile
2020-04-28 14:03:50 -07:00
Darren Shepherd
e6eabbb6a7 $ must be escaped in Makefile 2020-04-27 12:09:07 -07:00
Darren Shepherd
5715e1ba0d Add ability to disable kubeproxy 2020-04-27 11:24:00 -07:00
Darren Shepherd
7920fa48c9 Only need to resolve the path of host-local if Flannel is enabled 2020-04-27 11:17:41 -07:00
Darren Shepherd
8cc9efdf7c Allow InitLogging to be called twice
This makes it a bit easier to embed k3s into another go program
2020-04-27 11:16:08 -07:00
Darren Shepherd
8b8af94eb2 Move disabled items to a const to keep more consistency
This also help when embedding k3s because we can programmitically know
all the components to disable.
2020-04-27 11:15:35 -07:00
Darren Shepherd
c25f1ab1b6 Check for error on mkdir 2020-04-27 11:14:21 -07:00
Darren Shepherd
0efe2af1a7
Merge pull request #1637 from MaciejKucia/mattkucia/fix-install
install: Properly detect enabled selinux
2020-04-27 09:25:15 -07:00
Darren Shepherd
130e6e31a1
Merge pull request #1664 from KnicKnic/windows-18-build
fix build windows v1.18
2020-04-27 09:23:32 -07:00
Darren Shepherd
ad557bfeed
Merge pull request #1659 from joakimr-axis/joakimr-axis_package-cli-clean
package-cli: Remove superfluous file exist check
2020-04-27 09:23:16 -07:00
Darren Shepherd
e4f87f51e2
Merge pull request #1681 from KnicKnic/fix_file_paths
fix usage of path instead of filepath
2020-04-27 09:21:48 -07:00
Darren Shepherd
7d06d2ccc1
Merge pull request #1653 from KnicKnic/enable_agent_windows
enable agent to start on windows
2020-04-27 09:05:12 -07:00
Knic Knic
44b8af097c fix usage of path instead of filepath 2020-04-25 00:29:18 -07:00
Erik Wilson
2c49341113
Merge pull request #1669 from erikwilson/manifest-mod-time
Check modification time before deploying manifests
2020-04-23 14:17:14 -07:00