github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,890 Commits
33 Branches
860 Tags
624 MiB
Commit Graph

232 Commits (b4eca61aeb833724dd0bb277bff8982e7d9ee9b7)

Author SHA1 Message Date
Erik Wilson cccba681a9
Test script cleanup backport from RKE2 (#2650) 
* Test script cleanup backport from RKE2

Signed-off-by: Erik Wilson <Erik.E.Wilson@gmail.com>

* Update scripts/test

Co-authored-by: Brian Downs <brian.downs@gmail.com>

Co-authored-by: Brian Downs <brian.downs@gmail.com>
 2020-12-08 10:43:31 -07:00
Akihiro Suda 27e64c72a1 rancher/k3s-root -> k3s-io/k3s-root 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-12-01 11:00:00 -08:00
Akihiro Suda 679e4df1b0 Bump k3s-root to v0.7.1 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-12-01 11:00:00 -08:00
Jacob Blain Christen 3647654fe4
[migration k3s-io] update helm-controller dependency (#2569) 
rancher/helm-controller ➡️ k3s-io/helm-controller

Part of https://github.com/rancher/k3s/issues/2189

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2020-12-01 08:59:10 -07:00
Jacob Blain Christen cc32e2f9a0
[migration k3s-io] update containerd, cri, and cri-tools replace directives (#2591) 
- rancher/cri ➡️ k3s-io/cri
- rancher/cri-tools ➡️ k3s-io/cri-tools
- rancher/containerd ➡️ k3s-io/containerd

Part of https://github.com/rancher/k3s/issues/2189

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2020-11-30 10:40:54 -07:00
Brad Davidson 10474638d7 Clean up architecture handling 
* Remove unused release.sh and DAPPER_HOST_ARCH
* Reliably use ARCH from version.sh
* Export GOARCH and GOARM so that they are used by `go build`

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-11-18 15:25:39 -08:00
Brad Davidson fcb864a5e2
Update sonobuoy version and use rancher mirrored image (#2482) 
* Update sonobuoy version
* Use upstream tag for Kubernetes version instead of replacement tag
    Allows building against upstream alpha/beta/rc releases
* Use env variable for sonobuoy version
* Bump version for QA e2e tests

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-11-06 13:33:31 -08:00
Brad Davidson 50ea2d8164 Fix size check and make script shell consistent 
Related to #2205

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-11-05 15:51:10 -08:00
Erik Wilson 992ca52c31
Enable go test in ci 2020-11-05 09:48:53 -07:00
Brad Davidson 4db415c1db Only create k3s-images.txt on amd64 
The list is the same across architectures, and is validated against the
list in git as part of CI... so there's no reason to be pushing it from
every pipeline. It's also causing conflicts when multiple pipelines try
to upload it at the same time.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-09-18 09:49:58 -07:00
Brian Downs e0a9060d59
Merge pull request #2253 from briandowns/issue-2106 
Add Trivy Scans for Built Images
 2020-09-17 08:46:31 -07:00
Brian Downs 74ce99f5ff remove use of docker image for arch purposes 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2020-09-16 13:37:42 -07:00
Brad Davidson ae5519c047
Use rancher-mirrored busybox for local-path-provisioner (#2257) 
Related to #1908

Will be fixed upstream by
https://github.com/rancher/local-path-provisioner/pull/135/ but we're
not going to update the LPP image right now since it's undergoing some
changes that we don't want to pick up at the moment.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-09-15 18:02:51 -07:00
Brian Downs c53f7e99e2 update error message 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2020-09-15 11:54:34 -07:00
Brian Downs f4c12a44ee add trivy scans for built images 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2020-09-15 11:43:27 -07:00
Brian Downs f72d39ad9c
add binary size check script, makefile target, and added to CI (#2209) 
* add binary size check script, makefile target, and added to drone

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* move script call to package script

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* move script call to ci script

Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2020-09-04 13:54:23 -07:00
Erik Wilson f3a0248a03
Update vagrant for alpine 3.12 2020-08-28 17:18:28 -07:00
Brad Davidson c980fa68a0
Update helm-controller for HelmChartConfig CRD (#2114) 
* Update helm-controller for HelmChartConfig CRD

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-08-20 14:23:50 -07:00
Chris Kim b5e57a10d5 Bump k3s-root to v0.6.0-rc3 for https://github.com/rancher/k3s/issues/1812 
Signed-off-by: Chris Kim <oats87g@gmail.com>
 2020-07-24 11:16:50 -07:00
Brad Davidson 4eb88a2fd3
Merge pull request #2042 from brandond/coredns_sync_1919-master 
Update coredns version for master
 2020-07-21 15:12:59 -07:00
Brad Davidson 9da8dc4f61 Update coredns version to 1.6.9 for master 
Needed for #1844

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-07-21 11:06:44 -07:00
Brad Davidson 9e00f6dc73 Update k3s-root to pull in updated slirp4netns 
Related to #1709

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-07-17 16:47:44 -07:00
Erik Wilson 66a8c2ad7f
Merge pull request #1899 from erikwilson/config-file 
Add config file support
 2020-07-14 08:41:45 -07:00
Erik Wilson 466f093943
Stat build to show file size 2020-07-13 10:06:23 -07:00
Erik Wilson 176bfdbbb6
Update Vagrant dev environment 2020-07-10 15:36:46 -07:00
Chris Kim 2e93004ee7 update k3s-root to v0.5.0 and remove k3s specific modifications to k3s-root (as they have moved into k3s-root) 
Signed-off-by: Chris Kim <oats87g@gmail.com>
 2020-07-01 15:56:47 -07:00
Hussein Galal 01035ba9df
Update helm controller to 0.6.3 (#1931) 
* update helm controller to 0.6.3

* update klipper-helm to v0.2.7
 2020-06-21 19:12:54 +02:00
galal-hussein 10db6a4c51 update klipper image im image-list 2020-06-08 21:57:29 +02:00
Darren Shepherd 4317a91b96 Delete dqlite 2020-06-06 16:39:41 -07:00
Taeho Kim 0a30b92089
Update image-list.txt 2020-06-02 23:34:07 +09:00
Erik Wilson 02dccd328a
Merge pull request #1835 from evrardjp/remove-trailing-whitespaces 
Remove trailing whitespaces
 2020-05-28 17:07:01 -07:00
Brian Downs 3864fa2ba8 update CNI to v0.8.6-k3s1 2020-05-28 14:44:03 -07:00
Jean-Philippe Evrard eabc82c724 Remove trailing whitespaces 
To please my OCD, and remove my editor flashing boxes,
I am removing trailing whitespaces. They have no purpose in life.
 2020-05-27 17:27:30 +02: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 202a2ae482 Check for correct go vendoring 2020-05-04 17:26:05 -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 5d77f24e7e Bump k3s-root to 0.4.1 2020-05-04 09:18:35 -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
galal-hussein 37e91dc3a1 update klipper image in airgap 2020-04-23 20:50:32 +02:00
Joakim Roubert ce109602cb package-cli: Remove superfluous file exist check 
The command rm -f will succeed even if run for a file that does not
exist. Hence it is superfluous to existence check a file that we want
to purge with rm -f, which makes the script a bit simpler to read.

Change-Id: If4eafea568301f418e0dd533e7175781ebf6000a
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2020-04-21 14:26:05 +02:00
Joakim Roubert 9307fcc332 package-cli: Remove redundant rm -rf build/data 
Moving symlinks to containerd to a for loop makes maintenance easier.
It also reveals a duplicate, redundant, rm -rf build/data and one
duplicate, redundant, rm -rf bin/kubectl, that can be both be purged.

Change-Id: Id81a05dcf2dadcc60ef8171494a284fbe1630400
Signed-off-by: Joakim Roubert <joakim.roubert@axis.com>
 2020-04-21 13:33:29 +02:00
Erik Wilson 0434eea44c Disable conformance test for arm64 2020-04-19 08:52:51 -07:00
Joakim Roubert b313c196a1 package-cli: Remove redundant rm -rf build/data 
Moving symlinks to containerd to a for loop makes maintenance easier;
also using the -f flag for ln rather than having a separate rm step.
It also reveals a duplicate, redundant, rm -rf build/data and one
duplicate, redundant, rm -rf bin/kubectl, that can be both be purged.

Signed-off-by: Joakim Roubert <joakim.roubert@axis.com>
 2020-04-16 08:47:41 +02:00
Joakim Roubert bb0b4db228
Let variable handle go binary name in scripts (#1532) 
During e.g. cross-compiling, it is sometimes useful to be able to have
another binary than the default one as the compiler. This patch for the
build scripts lets "go" be the default value for the variable GO, and
the latter is then used as the go compiler.

Change-Id: I0adf7a661b26593d9b0ea902a61b631b80e76ae7
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2020-03-25 12:35:07 -07:00
Joakim Roubert 47e4e7b582
Dockerfile.dapper: Add proxy handling (#1499) 
With this patch the dapper build will also work in environments behind
proxies.

Change-Id: I6d9c03d03d2e254043720fc7e77822826e4f38c8
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2020-03-25 12:34:20 -07:00
Joakim Roubert 36908f2152
Merge branch 'master' into joakimr-axis_comparison 2020-03-24 09:24:52 +01:00
galal-hussein 2b6faa925f use mirrored images for traefik and coredns 2020-03-23 19:00:30 +02:00
Joakim Roubert 9741fe7c85
Merge branch 'master' into joakimr-axis_comparison 2020-03-17 08:28:25 +01:00
Erik Wilson 2835c76e5d Add airgap image list to release artifacts 2020-03-16 18:03:20 -07:00
Erik Wilson d15eb6aab6 Update RPM systemd services for easy modification. 
Modified installer produces a k3s-server and k3s-agent systemd
service, with env files located in /etc/rancher/k3s.

The k3s-server service may be started without modification but
k3s-agent requires a token and url modification to the
/etc/rancher/k3s/k3s-agent.env file for functionality.

The k3s-server service will conflict with the k3s-agent service,
so both may not be started at the same time.

Creates ./package/rpm/ repo dir for rpm specific resources and
relocates k3s.spec.
 2020-03-16 17:23:43 -07:00
Joakim Roubert 9421da08ac
Merge branch 'master' into joakimr-axis_comparison 2020-03-13 10:28:06 +01:00
galal-hussein 97cb85ced8 Fix test-run-basics to check for traefik 2020-03-11 01:54:12 +02:00
galal-hussein 3f927d8006 Revert "Replace traefik with nginx" 
This reverts commit 9a17033095.
 2020-03-11 01:45:23 +02:00
Erik Wilson d578198ac0 Add rpm build & repo publish 2020-03-10 11:48:14 -07:00
Erik Wilson 456962b2b8 Update versioning for no .git or go 2020-03-10 11:25:43 -07:00
Erik Wilson 2071247a2f Cleanup prompt for vagrant centos 2020-03-10 11:25:43 -07:00
Erik Wilson d95707e294 Clean up airgap image list 2020-03-09 20:29:41 -07:00
Erik Wilson 9b8e829ec7 Check for changes in the airgap image list 2020-03-09 19:58:00 -07:00
Joakim Roubert e5d43e1382
Merge branch 'master' into joakimr-axis_comparison 2020-03-09 10:16:23 +01:00
galal-hussein 717b5a765e use multiarch image for nginx 2020-03-07 00:19:32 +02:00
Joakim Roubert 0a54d46c5b Fix inconsistent shell script comparison operator == 
In package-airgap and provision/vagrant, replace == with = which is
used in all other script string comparisons in this repository to keep
things consistent.

Change-Id: I2f59e9a8d1d2fc2984ed3952fd4794f1028b6f66
Signed-off-by: Joakim Roubert <joakimr@axis.com>
 2020-03-04 16:26:55 +01:00
Erik Wilson ceff3f58fb
Merge pull request #1466 from galal-hussein/traefik_to_nginx 
Replace traefik with nginx
 2020-03-02 15:04:09 -07:00
galal-hussein 9a17033095 Replace traefik with nginx 2020-03-03 00:00:39 +02:00
Erik Wilson 74b5a4d5e0 Add ubuntu to vagrant provision 2020-03-02 09:38:07 -07:00
Erik Wilson 4370fc1482 Remove old runc & containerd shims on build 2020-02-28 17:32:42 -07:00
Erik Wilson 89fa8afaa3 Cleanup vagrant provision scripts 2020-02-28 16:51:19 -07:00
Erik Wilson 5eb1b21822 Clean up building && provide Vagrant centos7 setup 2020-02-28 15:39:11 -07:00
Erik Wilson f31a8d9e94
Merge pull request #1456 from galal-hussein/new_branch 
Send dispatch event with drone
 2020-02-26 13:09:24 -07:00
galal-hussein b2ac8aad22 Send dispatch event with drone 2020-02-25 20:10:32 +02:00
Darren Shepherd 4d32fe9959 Support SELinux 2020-02-24 16:03:09 -07:00
Erik Wilson c100dfc2cb Add 'k3s' to kubernetes version metadata in dev builds 2020-02-24 14:50:03 -07:00
Erik Wilson a7053f392e Create a latest tag in docker hub for new releases 2020-02-14 11:35:21 -07:00
Erik Wilson 849f3c5521 Remove cgroup provision from dev vagrant script 2020-02-05 18:48:43 -07:00
Erik Wilson 6317da01e5 Enforce that tag versions are prefixed with k8s go.mod version 2020-01-24 10:55:35 -07:00
Erik Wilson 5221af4752 Fix exit code on test error 2020-01-24 07:37:54 -07:00
Erik Wilson 940be0e515 Fix e2e logs not published 2020-01-21 14:51:07 -07:00
Erik Wilson 129317db7a
Merge pull request #1330 from erikwilson/sonobuoy-conformance-version 
Cleanup sonobuoy
 2020-01-21 11:48:50 -07:00
Erik Wilson d6370d9bfb Bump helm-controller to v0.4.1 2020-01-21 11:47:22 -07:00
Erik Wilson 5117ea0ca7 Always exit 0 on tag for tests 2020-01-21 11:07:12 -07:00
Erik Wilson 4ec28d2707 Set conformance version from k8s version 2020-01-21 10:32:08 -07:00
Erik Wilson c110f17df4 Disable db tests on publish 2020-01-20 19:34:01 -07:00
Erik Wilson 7305b4091e
Merge pull request #1324 from erikwilson/enable-db-tests 
Enable mysql & postgres tests
 2020-01-20 16:49:40 -07:00
Erik Wilson 40a4e953ff Enable mysql & postgres tests 2020-01-20 16:22:23 -07:00
Erik Wilson 7d9bdaee23 Check versions for dot in metadata 2020-01-20 16:01:04 -07:00
Erik Wilson 211d735a08 Update manifest 2020-01-20 15:05:46 -07:00
Erik Wilson 4439a7df08 Test cleanup 2020-01-16 14:54:58 -07:00
Erik Wilson 0867ee1cd0 Update air-gap for traefik 1.7.19 2019-12-24 11:32:06 -07:00
Erik Wilson 8498840922
Merge pull request #1239 from erikwilson/upload-builds-cloud-storage 
Upload build to google cloud bucket
 2019-12-24 10:27:27 -07:00
Erik Wilson ff311b7fce Upload build to google cloud bucket 2019-12-24 09:58:43 -07:00
William Zhang a6d29b2ba9 Update klipper-helm images to v0.2.2 
follow with 8f8cfd102c (diff-579f509a7a35baa26b8b932d79aa954fR42)

Signed-off-by: William Zhang <zhang.wanmin@zte.com.cn>
 2019-12-24 17:26:05 +08:00
Erik Wilson 178898f969 Fix missing version for tags 2019-12-17 23:29:05 -07:00
Erik Wilson e72e9e3daa Cleanup k8s versioning 2019-12-17 12:21:47 -07:00
Erik Wilson 07028a3115 Fix image tags, replace + with - 2019-12-15 23:28:25 -07:00
Erik Wilson bddab9479c Set build version of k8s from k3s 2019-12-15 23:28:25 -07:00
Erik Wilson ce3a03a16a
Merge pull request #1111 from dduportal/patch-1 
Bump Traefik to 1.7.19
 2019-11-26 15:29:57 -07:00
Guangbo Chen 8ff4c3c256 Update base pause image to rancher repo 2019-11-25 16:09:05 +08:00
Damien Duportal 8fa125a8ff
update script 2019-11-23 07:53:10 +01:00
Erik Wilson 670d4b4162
Merge pull request #914 from erikwilson/validation-utilities 
Add check-config for system validation
 2019-11-13 09:00:08 -07:00
Erik Wilson a73f8b1773 Update check-config.sh for k3s 2019-11-13 08:34:24 -07:00
Darren Shepherd 9a4df7c05c
Merge pull request #1058 from ibuildthecloud/master 
Update kine/dynamiclistener
 2019-11-13 15:31:48 +00:00