From bc49f197d915261f6c42abc32e6c84a77fd1c18b Mon Sep 17 00:00:00 2001 From: iwilltry42 Date: Sun, 5 Jan 2020 20:51:38 +0100 Subject: [PATCH] cleanup and prepare for push to rancher/k3d --- .travis.yml | 22 +-- LICENSE | 2 +- README.md | 5 +- cmd/create/create.go | 2 +- cmd/create/createCluster.go | 2 +- cmd/create/createNode.go | 2 +- cmd/delete/delete.go | 2 +- cmd/delete/deleteCluster.go | 2 +- cmd/delete/deleteNode.go | 2 +- cmd/get/get.go | 2 +- cmd/get/getCluster.go | 2 +- cmd/get/getKubeconfig.go | 2 +- cmd/get/getNode.go | 2 +- cmd/load/load.go | 2 +- cmd/load/loadImage.go | 2 +- cmd/root.go | 2 +- cmd/start/start.go | 2 +- cmd/start/startCluster.go | 2 +- cmd/start/startNode.go | 2 +- cmd/stop/stop.go | 2 +- cmd/stop/stopCluster.go | 2 +- cmd/stop/stopNode.go | 2 +- cmd/util/filter.go | 2 +- cmd/util/ports.go | 2 +- cmd/util/util.go | 2 +- cmd/util/volumes.go | 2 +- docs/documentation.md | 2 +- docs/examples.md | 184 +------------------------- docs/faq.md | 2 +- go.mod | 2 - main.go | 2 +- pkg/cluster/cluster.go | 2 +- pkg/cluster/clusterName.go | 2 +- pkg/cluster/kubeconfig.go | 2 +- pkg/cluster/node.go | 2 +- pkg/runtimes/containerd/container.go | 2 +- pkg/runtimes/containerd/containerd.go | 2 +- pkg/runtimes/containerd/kubeconfig.go | 2 +- pkg/runtimes/containerd/network.go | 2 +- pkg/runtimes/containerd/node.go | 2 +- pkg/runtimes/containerd/util.go | 2 +- pkg/runtimes/containerd/volume.go | 2 +- pkg/runtimes/docker/container.go | 2 +- pkg/runtimes/docker/docker.go | 2 +- pkg/runtimes/docker/kubeconfig.go | 2 +- pkg/runtimes/docker/network.go | 2 +- pkg/runtimes/docker/node.go | 2 +- pkg/runtimes/docker/translate.go | 2 +- pkg/runtimes/docker/translate_test.go | 2 +- pkg/runtimes/docker/types.go | 2 +- pkg/runtimes/docker/util.go | 2 +- pkg/runtimes/docker/volume.go | 2 +- pkg/runtimes/runtime.go | 2 +- pkg/tools/tools.go | 2 +- pkg/types/types.go | 2 +- pkg/util/files.go | 2 +- pkg/util/randomString.go | 2 +- thoughts.md | 3 +- version/version.go | 2 +- 59 files changed, 71 insertions(+), 253 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6bfaebef..4b0bd593 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,29 +1,29 @@ dist: bionic language: go env: -- GO111MODULE=on + - GO111MODULE=on go: -- 1.13.x + - 1.13.x git: depth: 1 install: true before_script: -- curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ${GOPATH}/bin v1.20.0 -- go get github.com/mitchellh/gox@v1.0.1 + - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ${GOPATH}/bin v1.22.2 + - go get github.com/mitchellh/gox@v1.0.1 script: -- make fmt check build-cross + - make fmt check build-cross deploy: provider: releases skip_cleanup: true api_key: secure: VFb0jmL6t+cuKWAGC5OLeseTJrK3CakD5Laeyp0JVG/o3/cYgHP0lIeDmJJMZL/Luxm5aL8QHsCRfQoMBAnj6Q8hchI9rbcYhFZzuFJYyDxjcrPm0+kM3yiK14lQZNvksy2ZSsO7D63c8x9sQVrEus4idVTUoxrpSXLM2eVjl6W0O2RdZvLsxgaLPwV1ufpihrqbXdEUjt/YSYpHiC5gS3o+FcyMGucJQdN/L7p6jyAqVgg4+t8bdyWj6+MEG4p8lmWhhbGzDo38iMxtCBu+nDHRsbivay3eJZ643VguX0lj62Vt5KUTcVJntmZqQ2UF6FoEVUPOegkrSeoiMuOH1+nYwcsfMFijMkrcFhb6bAisJJd6agdhFWXiSwL88FQkJh0DqeA0tFFIzDbTS/AZTY4Li8bWng3aCBgSXiMzIBf0es+wMDw0gwhfH44Y/RAsKSQJ/Lln00AaVzkOkOWOmu5Ks0CVYDy0M5QDQOCW2E9TIb7WdIMh3aNCkZi+rGovigejJv3vUZqkN03Og07Hbrjgfg28iY3isIt3soOrVqek2hJJFnKjUhhv2OhJm3z6FpTyMViUtSmJ+LTiBjpyiWC4QuaITDadCJTxZQwobhI+18c2Zi5/HjTX1pgD1wk3quv9R4bGjVINenefG6xxaNj+CeFTfrQnnHuXOL50828= file: - - _dist/k3d-darwin-amd64 - - _dist/k3d-linux-386 - - _dist/k3d-linux-amd64 - - _dist/k3d-linux-arm - - _dist/k3d-linux-arm64 - - _dist/k3d-windows-amd64.exe + - _dist/k3d-darwin-amd64 + - _dist/k3d-linux-386 + - _dist/k3d-linux-amd64 + - _dist/k3d-linux-arm + - _dist/k3d-linux-arm64 + - _dist/k3d-windows-amd64.exe on: repo: rancher/k3d tags: true diff --git a/LICENSE b/LICENSE index 35c38df3..31f21541 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright © 2019 Thorsten Klein +Copyright © 2019-2020 Thorsten Klein Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 61311888..06f5afec 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,9 @@ k3s is the lightweight Kubernetes distribution by Rancher: [rancher/k3s](https://github.com/rancher/k3s) -This repository is based on [@zeerorg](https://github.com/zeerorg/)'s [zeerorg/k3s-in-docker](https://github.com/zeerorg/k3s-in-docker), reimplemented in Go by [@iwilltry42](https://github.com/iwilltry42/) in [iwilltry42/k3d](https://github.com/iwilltry42/k3d), which is now [rancher/k3d](https://github.com/rancher/k3d). +k3d creates containerized k3s clusters. This means, that you can spin up a multi-node k3s cluster on a single machine using docker. + +This repository is based on [@zeerorg](https://github.com/zeerorg/)'s [zeerorg/k3s-in-docker](https://github.com/zeerorg/k3s-in-docker), reimplemented in Go by [@iwilltry42](https://github.com/iwilltry42/) in [iwilltry42/k3d](https://github.com/iwilltry42/k3d), which got adopted by Rancher in[rancher/k3d](https://github.com/rancher/k3d). ## Requirements @@ -17,6 +19,7 @@ This repository is based on [@zeerorg](https://github.com/zeerorg/)'s [zeerorg/k You have several options there: +- via brew (homebrew/linuxbrew): `brew install k3d` - use the install script to grab the latest release: - wget: `wget -q -O - https://raw.githubusercontent.com/rancher/k3d/master/install.sh | bash` - curl: `curl -s https://raw.githubusercontent.com/rancher/k3d/master/install.sh | bash` diff --git a/cmd/create/create.go b/cmd/create/create.go index b18eedf5..1821fd17 100644 --- a/cmd/create/create.go +++ b/cmd/create/create.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/create/createCluster.go b/cmd/create/createCluster.go index acd4a71e..7b7911a1 100644 --- a/cmd/create/createCluster.go +++ b/cmd/create/createCluster.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/create/createNode.go b/cmd/create/createNode.go index a506ad33..82661dc0 100644 --- a/cmd/create/createNode.go +++ b/cmd/create/createNode.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/delete/delete.go b/cmd/delete/delete.go index ee8982d2..08d950e5 100644 --- a/cmd/delete/delete.go +++ b/cmd/delete/delete.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/delete/deleteCluster.go b/cmd/delete/deleteCluster.go index f00b1216..be5eb1e2 100644 --- a/cmd/delete/deleteCluster.go +++ b/cmd/delete/deleteCluster.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/delete/deleteNode.go b/cmd/delete/deleteNode.go index 23a185f0..a92c05fa 100644 --- a/cmd/delete/deleteNode.go +++ b/cmd/delete/deleteNode.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/get/get.go b/cmd/get/get.go index c282f254..e46f14f5 100644 --- a/cmd/get/get.go +++ b/cmd/get/get.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/get/getCluster.go b/cmd/get/getCluster.go index 86f5026c..c2c1cf17 100644 --- a/cmd/get/getCluster.go +++ b/cmd/get/getCluster.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/get/getKubeconfig.go b/cmd/get/getKubeconfig.go index cbe02714..eee9b28f 100644 --- a/cmd/get/getKubeconfig.go +++ b/cmd/get/getKubeconfig.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/get/getNode.go b/cmd/get/getNode.go index 4b0fcf82..93bdbf27 100644 --- a/cmd/get/getNode.go +++ b/cmd/get/getNode.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/load/load.go b/cmd/load/load.go index 41969c8c..bb8faf54 100644 --- a/cmd/load/load.go +++ b/cmd/load/load.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/load/loadImage.go b/cmd/load/loadImage.go index b91ff82c..5533bc62 100644 --- a/cmd/load/loadImage.go +++ b/cmd/load/loadImage.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/root.go b/cmd/root.go index 48858d16..94e8ace9 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/start/start.go b/cmd/start/start.go index 0a0a827a..b7b6d34e 100644 --- a/cmd/start/start.go +++ b/cmd/start/start.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/start/startCluster.go b/cmd/start/startCluster.go index 612d0fa3..f9916d02 100644 --- a/cmd/start/startCluster.go +++ b/cmd/start/startCluster.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/start/startNode.go b/cmd/start/startNode.go index 1a04e0f3..acc09c89 100644 --- a/cmd/start/startNode.go +++ b/cmd/start/startNode.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/stop/stop.go b/cmd/stop/stop.go index 039c315c..4e02a302 100644 --- a/cmd/stop/stop.go +++ b/cmd/stop/stop.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/stop/stopCluster.go b/cmd/stop/stopCluster.go index b357a1f3..78be77bb 100644 --- a/cmd/stop/stopCluster.go +++ b/cmd/stop/stopCluster.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/stop/stopNode.go b/cmd/stop/stopNode.go index 90579691..17b4ecde 100644 --- a/cmd/stop/stopNode.go +++ b/cmd/stop/stopNode.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/util/filter.go b/cmd/util/filter.go index a4d77330..e7aaf17a 100644 --- a/cmd/util/filter.go +++ b/cmd/util/filter.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/util/ports.go b/cmd/util/ports.go index f5a4aa58..b30800cf 100644 --- a/cmd/util/ports.go +++ b/cmd/util/ports.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/util/util.go b/cmd/util/util.go index 87fa7199..be1ec9c9 100644 --- a/cmd/util/util.go +++ b/cmd/util/util.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/util/volumes.go b/cmd/util/volumes.go index 313fe929..816ac0da 100644 --- a/cmd/util/volumes.go +++ b/cmd/util/volumes.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/docs/documentation.md b/docs/documentation.md index dc2b0489..61d202b5 100644 --- a/docs/documentation.md +++ b/docs/documentation.md @@ -9,4 +9,4 @@ * the initializing master node will have the `--cluster-init` flag appended * all other master nodes will refer to the initializing master node via `--server https://:6443` * API-Ports - * by default, we don't expose any API-Port (no host port mapping) \ No newline at end of file + * by default, we don't expose any API-Port (no host port mapping) diff --git a/docs/examples.md b/docs/examples.md index e7968a3d..66150d33 100644 --- a/docs/examples.md +++ b/docs/examples.md @@ -1,185 +1,3 @@ # Examples -## Expose services - -### 1. via Ingress - -1. Create a cluster, mapping the ingress port 80 to localhost:8081 - - `k3d create --api-port 6550 --publish 8081:80 --workers 2` - - - Note: `--api-port 6550` is not required for the example to work. It's used to have `k3s`'s ApiServer listening on port 6550 with that port mapped to the host system. - -2. Get the kubeconfig file - - `export KUBECONFIG="$(k3d get-kubeconfig --name='k3s-default')"` - -3. Create a nginx deployment - - `kubectl create deployment nginx --image=nginx` - -4. Create a ClusterIP service for it - - `kubectl create service clusterip nginx --tcp=80:80` - -5. Create an ingress object for it with `kubectl apply -f` - - ```YAML - apiVersion: extensions/v1beta1 - kind: Ingress - metadata: - name: nginx - annotations: - ingress.kubernetes.io/ssl-redirect: "false" - spec: - rules: - - http: - paths: - - path: / - backend: - serviceName: nginx - servicePort: 80 - ``` - -6. Curl it via localhost - - `curl localhost:8081/` - -### 2. via NodePort - -1. Create a cluster, mapping the port 30080 from worker-0 to localhost:8082 - - `k3d create --publish 8082:30080@k3d-k3s-default-worker-0 --workers 2` - - - Note: Kubernetes' default NodePort range is [`30000-32767`](https://kubernetes.io/docs/concepts/services-networking/service/#nodeport) - -... (Steps 2 and 3 like above) ... - -1. Create a NodePort service for it with `kubectl apply -f` - - ```YAML - apiVersion: v1 - kind: Service - metadata: - labels: - app: nginx - name: nginx - spec: - ports: - - name: 80-80 - nodePort: 30080 - port: 80 - protocol: TCP - targetPort: 80 - selector: - app: nginx - type: NodePort - ``` - -2. Curl it via localhost - - `curl localhost:8082/` - -## Connect with a local insecure registry - -This guide takes you through setting up a local insecure (http) registry and integrating it into your workflow so that: -- you can push to the registry from your host -- the cluster managed by k3d can pull from that registry - -The registry will be named `registry.local` and run on port `5000`. -### Create the registry - -
-docker volume create local_registry
-
-docker container run -d --name registry.local -v local_registry:/var/lib/registry --restart always -p 5000:5000 registry:2
-
- -### Create the cluster with k3d - -First we need a place to store the config template: `mkdir -p /home/${USER}/.k3d` - -Create a file named `config.toml.tmpl` in `/home/${USER}/.k3d`, with following content: - -
-# Original section: no changes
-[plugins.opt]
-path = "{{ .NodeConfig.Containerd.Opt }}"
-[plugins.cri]
-stream_server_address = "{{ .NodeConfig.AgentConfig.NodeName }}"
-stream_server_port = "10010"
-{{- if .IsRunningInUserNS }}
-disable_cgroup = true
-disable_apparmor = true
-restrict_oom_score_adj = true
-{{ end -}}
-{{- if .NodeConfig.AgentConfig.PauseImage }}
-sandbox_image = "{{ .NodeConfig.AgentConfig.PauseImage }}"
-{{ end -}}
-{{- if not .NodeConfig.NoFlannel }}
-  [plugins.cri.cni]
-    bin_dir = "{{ .NodeConfig.AgentConfig.CNIBinDir }}"
-    conf_dir = "{{ .NodeConfig.AgentConfig.CNIConfDir }}"
-{{ end -}}
-
-# Added section: additional registries and the endpoints
-[plugins.cri.registry.mirrors]
-  [plugins.cri.registry.mirrors."registry.local:5000"]
-    endpoint = ["http://registry.local:5000"]
-
- -Finally start a cluster with k3d, passing-in the config template: - -``` -CLUSTER_NAME=k3s-default -k3d create \ - --name ${CLUSTER_NAME} \ - --wait 0 \ - --auto-restart \ - --volume /home/${USER}/.k3d/config.toml.tmpl:/var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl -``` - -### Wire them up - -- Connect the registry to the cluster network: `docker network connect k3d-k3s-default registry.local` -- Add `127.0.0.1 registry.local` to your `/etc/hosts` - -### Test - -Push an image to the registry: - -``` -docker pull nginx:latest -docker tag nginx:latest registry.local:5000/nginx:latest -docker push registry.local:5000/nginx:latest -``` - -Deploy a pod referencing this image to your cluster: - -``` -cat < /home/thklein/Go/src/github.com/rancher/k3d diff --git a/main.go b/main.go index 5891b3ae..9f66edf7 100644 --- a/main.go +++ b/main.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go index a630c8f0..95347b49 100644 --- a/pkg/cluster/cluster.go +++ b/pkg/cluster/cluster.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/cluster/clusterName.go b/pkg/cluster/clusterName.go index 9748957d..b191ee45 100644 --- a/pkg/cluster/clusterName.go +++ b/pkg/cluster/clusterName.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/cluster/kubeconfig.go b/pkg/cluster/kubeconfig.go index baef8df0..c2f06712 100644 --- a/pkg/cluster/kubeconfig.go +++ b/pkg/cluster/kubeconfig.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/cluster/node.go b/pkg/cluster/node.go index 42ec7342..35d4671a 100644 --- a/pkg/cluster/node.go +++ b/pkg/cluster/node.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/runtimes/containerd/container.go b/pkg/runtimes/containerd/container.go index fa28f66f..7e305c8b 100644 --- a/pkg/runtimes/containerd/container.go +++ b/pkg/runtimes/containerd/container.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/runtimes/containerd/containerd.go b/pkg/runtimes/containerd/containerd.go index b3c7df3d..d1108687 100644 --- a/pkg/runtimes/containerd/containerd.go +++ b/pkg/runtimes/containerd/containerd.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/runtimes/containerd/kubeconfig.go b/pkg/runtimes/containerd/kubeconfig.go index 0e79b2c3..805ea5ee 100644 --- a/pkg/runtimes/containerd/kubeconfig.go +++ b/pkg/runtimes/containerd/kubeconfig.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/runtimes/containerd/network.go b/pkg/runtimes/containerd/network.go index b59f4f56..1caa532c 100644 --- a/pkg/runtimes/containerd/network.go +++ b/pkg/runtimes/containerd/network.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/runtimes/containerd/node.go b/pkg/runtimes/containerd/node.go index ddd84a3b..b1884f25 100644 --- a/pkg/runtimes/containerd/node.go +++ b/pkg/runtimes/containerd/node.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/runtimes/containerd/util.go b/pkg/runtimes/containerd/util.go index ea7cc8c3..653ce3da 100644 --- a/pkg/runtimes/containerd/util.go +++ b/pkg/runtimes/containerd/util.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/runtimes/containerd/volume.go b/pkg/runtimes/containerd/volume.go index 0922d556..7dc49dcf 100644 --- a/pkg/runtimes/containerd/volume.go +++ b/pkg/runtimes/containerd/volume.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/runtimes/docker/container.go b/pkg/runtimes/docker/container.go index 6cd0f1f1..c1780014 100644 --- a/pkg/runtimes/docker/container.go +++ b/pkg/runtimes/docker/container.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/runtimes/docker/docker.go b/pkg/runtimes/docker/docker.go index e8823a58..424f2ff6 100644 --- a/pkg/runtimes/docker/docker.go +++ b/pkg/runtimes/docker/docker.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/runtimes/docker/kubeconfig.go b/pkg/runtimes/docker/kubeconfig.go index fa951948..96852a9a 100644 --- a/pkg/runtimes/docker/kubeconfig.go +++ b/pkg/runtimes/docker/kubeconfig.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/runtimes/docker/network.go b/pkg/runtimes/docker/network.go index 86f44dee..a90ea681 100644 --- a/pkg/runtimes/docker/network.go +++ b/pkg/runtimes/docker/network.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/runtimes/docker/node.go b/pkg/runtimes/docker/node.go index 6c8add41..8b90b7ca 100644 --- a/pkg/runtimes/docker/node.go +++ b/pkg/runtimes/docker/node.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/runtimes/docker/translate.go b/pkg/runtimes/docker/translate.go index 01e29d49..06dcc40b 100644 --- a/pkg/runtimes/docker/translate.go +++ b/pkg/runtimes/docker/translate.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/runtimes/docker/translate_test.go b/pkg/runtimes/docker/translate_test.go index 57a114dc..44475f5d 100644 --- a/pkg/runtimes/docker/translate_test.go +++ b/pkg/runtimes/docker/translate_test.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/runtimes/docker/types.go b/pkg/runtimes/docker/types.go index e256b42f..bbb75494 100644 --- a/pkg/runtimes/docker/types.go +++ b/pkg/runtimes/docker/types.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/runtimes/docker/util.go b/pkg/runtimes/docker/util.go index 53e45a95..7024215e 100644 --- a/pkg/runtimes/docker/util.go +++ b/pkg/runtimes/docker/util.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/runtimes/docker/volume.go b/pkg/runtimes/docker/volume.go index 9fa0670e..26e80e22 100644 --- a/pkg/runtimes/docker/volume.go +++ b/pkg/runtimes/docker/volume.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/runtimes/runtime.go b/pkg/runtimes/runtime.go index 7a91fee2..0b3c33a9 100644 --- a/pkg/runtimes/runtime.go +++ b/pkg/runtimes/runtime.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/tools/tools.go b/pkg/tools/tools.go index 662f0af2..874d6c8c 100644 --- a/pkg/tools/tools.go +++ b/pkg/tools/tools.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/types/types.go b/pkg/types/types.go index 9d3ab013..b89dd40d 100644 --- a/pkg/types/types.go +++ b/pkg/types/types.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/util/files.go b/pkg/util/files.go index 274502df..2eb48c2d 100644 --- a/pkg/util/files.go +++ b/pkg/util/files.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pkg/util/randomString.go b/pkg/util/randomString.go index 6b61ccbc..03ff2ee4 100644 --- a/pkg/util/randomString.go +++ b/pkg/util/randomString.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/thoughts.md b/thoughts.md index 759474af..cf36b2a2 100644 --- a/thoughts.md +++ b/thoughts.md @@ -26,7 +26,7 @@ k3d ## Overview -- `cmd/`: everything around the CLI of k3 = human interface, printed output (e.g. list of clusters) +- `cmd/`: everything around the CLI of k3d = human interface, printed output (e.g. list of clusters) - `pkg/`: everything else, can be used as a module from other Go projects - `cluster/`: everything around managing cluster components - `runtimes/`: translate k3d types (node, cluster, etc.) to container runtime specific types and manage them @@ -219,7 +219,6 @@ Here's how k3d types should translate to a runtime type: - all nodes - ENV - `K3S_TOKEN` for node authentication - - TODO: replaces `K3S_CLUSTER_SECRET` - CMD/ARGS - nothing special - Runtime Configuration diff --git a/version/version.go b/version/version.go index 6ce3b57a..f07a999a 100644 --- a/version/version.go +++ b/version/version.go @@ -1,5 +1,5 @@ /* -Copyright © 2019 Thorsten Klein +Copyright © 2020 The k3d Author(s) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal