Commit Graph

166 Commits

Author SHA1 Message Date
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