Skip to content

Commit 75a0171

Browse files
authored
Migrate from k3s-io master to main links (#476)
Signed-off-by: Derek Nola <derek.nola@suse.com>
1 parent a27f5bd commit 75a0171

File tree

20 files changed

+95
-95
lines changed

20 files changed

+95
-95
lines changed

docs/advanced.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ For advanced customization, you can create a containerd config template in the s
141141
Containerd 2.0 is backwards compatible with prior config versions, and k3s will continue to render legacy version 2 configuration from `config.toml.tmpl` if `config-v3.toml.tmpl` is not found.
142142
143143
The template file is rendered into the containerd config using the [`text/template`](https://pkg.go.dev/text/template) library.
144-
See `ContainerdConfigTemplateV3` and `ContainerdConfigTemplate` in [`templates.go`](https://github.com/k3s-io/k3s/blob/master/pkg/agent/templates/templates.go) for the default template content.
145-
The template is executed with a [`ContainerdConfig`](https://github.com/k3s-io/k3s/blob/master/pkg/agent/templates/templates.go#L22-L33) struct as its dot value (data argument).
144+
See `ContainerdConfigTemplateV3` and `ContainerdConfigTemplate` in [`templates.go`](https://github.com/k3s-io/k3s/blob/main/pkg/agent/templates/templates.go) for the default template content.
145+
The template is executed with a [`ContainerdConfig`](https://github.com/k3s-io/k3s/blob/main/pkg/agent/templates/templates.go#L22-L33) struct as its dot value (data argument).
146146
147147
### Base template
148148
@@ -254,7 +254,7 @@ See https://rootlesscontaine.rs/ to learn more about Rootless Kubernetes.
254254
* Enable cgroup v2 delegation, see https://rootlesscontaine.rs/getting-started/common/cgroup2/ .
255255
This step is required; the rootless kubelet will fail to start without the proper cgroups delegated.
256256
257-
* Download `k3s-rootless.service` from [`https://github.com/k3s-io/k3s/blob/<VERSION>/k3s-rootless.service`](https://github.com/k3s-io/k3s/blob/master/k3s-rootless.service).
257+
* Download `k3s-rootless.service` from [`https://github.com/k3s-io/k3s/blob/<VERSION>/k3s-rootless.service`](https://github.com/k3s-io/k3s/blob/main/k3s-rootless.service).
258258
Make sure to use the same version of `k3s-rootless.service` and `k3s`.
259259
260260
* Install `k3s-rootless.service` to `~/.config/systemd/user/k3s-rootless.service`.

docs/cli/certificate.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Support for the `k3s certificate rotate-ca` command and the ability to use CA ce
9292

9393
If CA certificates and keys are found the correct location during initial startup of the first server in the cluster, automatic generation of CA certificates will be bypassed.
9494

95-
An example script to pre-create the appropriate certificates and keys is available [in the K3s repo at `contrib/util/generate-custom-ca-certs.sh`](https://github.com/k3s-io/k3s/blob/master/contrib/util/generate-custom-ca-certs.sh).
95+
An example script to pre-create the appropriate certificates and keys is available [in the K3s repo at `contrib/util/generate-custom-ca-certs.sh`](https://github.com/k3s-io/k3s/blob/main/contrib/util/generate-custom-ca-certs.sh).
9696
This script should be run prior to starting K3s for the first time, and will create a full set of leaf CA certificates signed by common Root and Intermediate CA certificates.
9797
If you have an existing Root or Intermediate CA, this script can be used (or used as a starting point) to create the correct CA certificates to provision a K3s cluster with PKI rooted in an existing authority.
9898

@@ -169,7 +169,7 @@ mkdir -p /var/lib/rancher/k3s/server/tls
169169
cp /etc/ssl/certs/root-ca.pem /etc/ssl/certs/intermediate-ca.pem /etc/ssl/private/intermediate-ca.key /var/lib/rancher/k3s/server/tls
170170

171171
# Generate custom CA certs and keys.
172-
curl -sL https://github.com/k3s-io/k3s/raw/master/contrib/util/generate-custom-ca-certs.sh | bash -
172+
curl -sL https://github.com/k3s-io/k3s/raw/main/contrib/util/generate-custom-ca-certs.sh | bash -
173173
```
174174

175175
If the command completes successfully, you may install and/or start K3s for the first time.
@@ -206,7 +206,7 @@ cp /var/lib/rancher/k3s/server/tls/root-ca.* /var/lib/rancher/k3s/server/tls/int
206206
cp /var/lib/rancher/k3s/server/tls/service.key /opt/k3s/server/tls
207207

208208
# Generate updated custom CA certs and keys.
209-
curl -sL https://github.com/k3s-io/k3s/raw/master/contrib/util/generate-custom-ca-certs.sh | DATA_DIR=/opt/k3s bash -
209+
curl -sL https://github.com/k3s-io/k3s/raw/main/contrib/util/generate-custom-ca-certs.sh | DATA_DIR=/opt/k3s bash -
210210

211211
# Load the updated CA certs and keys into the datastore.
212212
k3s certificate rotate-ca --path=/opt/k3s/server
@@ -308,13 +308,13 @@ graph TD
308308

309309
#### Using The Example Script
310310

311-
An example script to create updated CA certificates and keys cross-signed by the existing CAs is available [in the K3s repo at `contrib/util/rotate-default-ca-certs.sh`](https://github.com/k3s-io/k3s/blob/master/contrib/util/rotate-default-ca-certs.sh).
311+
An example script to create updated CA certificates and keys cross-signed by the existing CAs is available [in the K3s repo at `contrib/util/rotate-default-ca-certs.sh`](https://github.com/k3s-io/k3s/blob/main/contrib/util/rotate-default-ca-certs.sh).
312312

313313
To use the example script to generate updated self-signed certificates that are cross-signed by the existing CAs, run the following commands:
314314
```bash
315315
# Create updated CA certs and keys, cross-signed by the current CAs.
316316
# This script will create a new temporary directory containing the updated certs, and output the new token values.
317-
curl -sL https://github.com/k3s-io/k3s/raw/master/contrib/util/rotate-default-ca-certs.sh | bash -
317+
curl -sL https://github.com/k3s-io/k3s/raw/main/contrib/util/rotate-default-ca-certs.sh | bash -
318318

319319
# Load the updated certs into the datastore; see the script output for the updated token values.
320320
k3s certificate rotate-ca --path=/var/lib/rancher/k3s/server/rotate-ca

docs/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ For a breakdown on the components that make up a server and agent, see the [Arch
2222

2323
### How can I build from source?
2424

25-
Please reference the K3s [BUILDING.md](https://github.com/k3s-io/k3s/blob/master/BUILDING.md) with instructions.
25+
Please reference the K3s [BUILDING.md](https://github.com/k3s-io/k3s/blob/main/BUILDING.md) with instructions.
2626

2727
### Where are the K3s logs?
2828

docs/networking/networking-services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ For details on the specific version of Traefik included with K3s, consult the Re
4040

4141
## Network Policy Controller
4242

43-
K3s includes an embedded network policy controller. The underlying implementation is [kube-router's](https://github.com/cloudnativelabs/kube-router) netpol controller library (no other kube-router functionality is present) and can be found [here](https://github.com/k3s-io/k3s/tree/master/pkg/agent/netpol).
43+
K3s includes an embedded network policy controller. The underlying implementation is [kube-router's](https://github.com/cloudnativelabs/kube-router) netpol controller library (no other kube-router functionality is present) and can be found [here](https://github.com/k3s-io/k3s/tree/main/pkg/agent/netpol).
4444

4545
To disable it, start each server with the `--disable-network-policy` flag.
4646

docs/release-notes-old/v1.24.X.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ For more details on what's new, see the [Kubernetes release notes](https://githu
228228
* Fix issue with servicelb startup failure when validating webhooks block creation [(#6920)](https://github.com/k3s-io/k3s/pull/6920)
229229
* The embedded cloud controller manager will no longer attempt to unconditionally re-create its namespace and serviceaccount on startup. This resolves an issue that could cause a deadlocked cluster when fail-closed webhooks are in use.
230230
* Backport user-provided CA cert and `kubeadm` bootstrap token support [(#6930)](https://github.com/k3s-io/k3s/pull/6930)
231-
* K3s now functions properly when the cluster CA certificates are signed by an existing root or intermediate CA. You can find a sample script for generating such certificates before K3s starts in the github repo at [contrib/util/certs.sh](https://github.com/k3s-io/k3s/blob/master/contrib/util/certs.sh).
231+
* K3s now functions properly when the cluster CA certificates are signed by an existing root or intermediate CA. You can find a sample script for generating such certificates before K3s starts in the github repo at [contrib/util/certs.sh](https://github.com/k3s-io/k3s/blob/main/contrib/util/certs.sh).
232232
* K3s now supports `kubeadm` style join tokens. `k3s token create` now creates join token secrets, optionally with a limited TTL.
233233
* K3s agents joined with an expired or deleted token stay in the cluster using existing client certificates via the NodeAuthorization admission plugin, unless their Node object is deleted from the cluster.
234234
* Fix access to hostNetwork port on NodeIP when egress-selector-mode=agent [(#6937)](https://github.com/k3s-io/k3s/pull/6937)
@@ -407,7 +407,7 @@ For more details on what's new, see the [Kubernetes release notes](https://githu
407407
<!-- v1.24.4+k3s1 -->
408408
This release updates Kubernetes to v1.24.4, and fixes a number of issues.
409409

410-
This release restores use of the `--docker` flag to the v1.24 branch. See [docs/adrs/cri-dockerd.md](https://github.com/k3s-io/k3s/blob/master/docs/adrs/cri-dockerd.md) for more information.
410+
This release restores use of the `--docker` flag to the v1.24 branch. See [docs/adrs/cri-dockerd.md](https://github.com/k3s-io/k3s/blob/main/docs/adrs/cri-dockerd.md) for more information.
411411

412412
For more details on what's new, see the [Kubernetes release notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.24.md#changelog-since-v1243).
413413

docs/release-notes-old/v1.25.X.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ For more details on what's new, see the [Kubernetes release notes](https://githu
350350
* Fix issue with servicelb startup failure when validating webhooks block creation [(#6916)](https://github.com/k3s-io/k3s/pull/6916)
351351
* The embedded cloud controller manager will no longer attempt to unconditionally re-create its namespace and serviceaccount on startup. This resolves an issue that could cause a deadlocked cluster when fail-closed webhooks are in use.
352352
* Backport user-provided CA cert and `kubeadm` bootstrap token support [(#6929)](https://github.com/k3s-io/k3s/pull/6929)
353-
* K3s now functions properly when the cluster CA certificates are signed by an existing root or intermediate CA. You can find a sample script for generating such certificates before K3s starts in the github repo at [contrib/util/certs.sh](https://github.com/k3s-io/k3s/blob/master/contrib/util/certs.sh).
353+
* K3s now functions properly when the cluster CA certificates are signed by an existing root or intermediate CA. You can find a sample script for generating such certificates before K3s starts in the github repo at [contrib/util/certs.sh](https://github.com/k3s-io/k3s/blob/main/contrib/util/certs.sh).
354354
* K3s now supports `kubeadm` style join tokens. `k3s token create` now creates join token secrets, optionally with a limited TTL.
355355
* K3s agents joined with an expired or deleted token stay in the cluster using existing client certificates via the NodeAuthorization admission plugin, unless their Node object is deleted from the cluster.
356356
* Fix access to hostNetwork port on NodeIP when egress-selector-mode=agent [(#6936)](https://github.com/k3s-io/k3s/pull/6936)

docs/release-notes-old/v1.26.X.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ For more details on what's new, see the [Kubernetes release notes](https://githu
500500
* Bump deps: trivy, sonobuoy, dapper, golangci-lint, gopls [(#6807)](https://github.com/k3s-io/k3s/pull/6807)
501501
* Fix check for (open)SUSE version [(#6791)](https://github.com/k3s-io/k3s/pull/6791)
502502
* Add support for user-provided CA certificates [(#6615)](https://github.com/k3s-io/k3s/pull/6615)
503-
* K3s now functions properly when the cluster CA certificates are signed by an existing root or intermediate CA. You can find a sample script for generating such certificates before K3s starts in the github repo at [contrib/util/certs.sh](https://github.com/k3s-io/k3s/blob/master/contrib/util/certs.sh).
503+
* K3s now functions properly when the cluster CA certificates are signed by an existing root or intermediate CA. You can find a sample script for generating such certificates before K3s starts in the github repo at [contrib/util/certs.sh](https://github.com/k3s-io/k3s/blob/main/contrib/util/certs.sh).
504504
* Ignore value conflicts when reencrypting secrets [(#6850)](https://github.com/k3s-io/k3s/pull/6850)
505505
* Add `kubeadm` style bootstrap token secret support [(#6663)](https://github.com/k3s-io/k3s/pull/6663)
506506
* K3s now supports `kubeadm` style join tokens. `k3s token create` now creates join token secrets, optionally with a limited TTL.

0 commit comments

Comments
 (0)