Skip to content

Commit

Permalink
Unify the registry hostname configured in containerd for the kind clu…
Browse files Browse the repository at this point in the history
…ster (gardener#8063)

* Unify the registry hostname configured in containerd for the kind cluster

* Enhance the export KUBECONFIG docs
  • Loading branch information
ialidzhikov authored Jun 13, 2023
1 parent 9c07652 commit a89de8d
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 18 deletions.
2 changes: 1 addition & 1 deletion docs/concepts/operator.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ make kind-operator-up
This command sets up a new KinD cluster named `gardener-local` and stores the kubeconfig in the `./example/gardener-local/kind/operator/kubeconfig` file.

> It might be helpful to copy this file to `$HOME/.kube/config`, since you will need to target this KinD cluster multiple times.
Alternatively, make sure to set your `KUBECONFIG` environment variable to `./example/gardener-local/kind/operator/kubeconfig` for all future steps via `export KUBECONFIG=example/gardener-local/kind/operator/kubeconfig`.
Alternatively, make sure to set your `KUBECONFIG` environment variable to `./example/gardener-local/kind/operator/kubeconfig` for all future steps via `export KUBECONFIG=$PWD/example/gardener-local/kind/operator/kubeconfig`.

All the following steps assume that you are using this kubeconfig.

Expand Down
4 changes: 2 additions & 2 deletions docs/deployment/getting_started_locally.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ make kind-up
This command sets up a new KinD cluster named `gardener-local` and stores the kubeconfig in the `./example/gardener-local/kind/local/kubeconfig` file.

> It might be helpful to copy this file to `$HOME/.kube/config`, since you will need to target this KinD cluster multiple times.
Alternatively, make sure to set your `KUBECONFIG` environment variable to `./example/gardener-local/kind/local/kubeconfig` for all future steps via `export KUBECONFIG=example/gardener-local/kind/local/kubeconfig`.
Alternatively, make sure to set your `KUBECONFIG` environment variable to `./example/gardener-local/kind/local/kubeconfig` for all future steps via `export KUBECONFIG=$PWD/example/gardener-local/kind/local/kubeconfig`.

All of the following steps assume that you are using this kubeconfig.

Expand Down Expand Up @@ -267,7 +267,7 @@ In order to deploy required resources in the KinD cluster that you just created,
make gardenlet-kind2-up
```

The following steps assume that you are using the kubeconfig that points to the `gardener-local` cluster (first KinD cluster): `export KUBECONFIG=example/gardener-local/kind/local/kubeconfig`.
The following steps assume that you are using the kubeconfig that points to the `gardener-local` cluster (first KinD cluster): `export KUBECONFIG=$PWD/example/gardener-local/kind/local/kubeconfig`.

You can wait for the `local2` `Seed` to be ready by running:

Expand Down
2 changes: 1 addition & 1 deletion docs/development/getting_started_locally.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ make kind-up KIND_ENV=local
This command sets up a new KinD cluster named `gardener-local` and stores the kubeconfig in the `./example/gardener-local/kind/local/kubeconfig` file.

> It might be helpful to copy this file to `$HOME/.kube/config` since you will need to target this KinD cluster multiple times.
Alternatively, make sure to set your `KUBECONFIG` environment variable to `./example/gardener-local/kind/local/kubeconfig` for all future steps via `export KUBECONFIG=example/gardener-local/kind/local/kubeconfig`.
Alternatively, make sure to set your `KUBECONFIG` environment variable to `./example/gardener-local/kind/local/kubeconfig` for all future steps via `export KUBECONFIG=$PWD/example/gardener-local/kind/local/kubeconfig`.

All following steps assume that you are using this kubeconfig.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
- |-
{{- if eq .Values.environment "skaffold" }}
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."localhost:5001"]
endpoint = ["http://{{ .Values.registry.hostname }}:5001"]
endpoint = ["http://garden.local.gardener.cloud:5001"]
{{- end }}
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."gcr.io"]
endpoint = ["http://{{ .Values.registry.hostname }}:5003"]
endpoint = ["http://garden.local.gardener.cloud:5003"]
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."eu.gcr.io"]
endpoint = ["http://{{ .Values.registry.hostname }}:5004"]
endpoint = ["http://garden.local.gardener.cloud:5004"]
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."ghcr.io"]
endpoint = ["http://{{ .Values.registry.hostname }}:5005"]
endpoint = ["http://garden.local.gardener.cloud:5005"]
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."registry.k8s.io"]
endpoint = ["http://{{ .Values.registry.hostname }}:5006"]
endpoint = ["http://garden.local.gardener.cloud:5006"]
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."quay.io"]
endpoint = ["http://{{ .Values.registry.hostname }}:5007"]
endpoint = ["http://garden.local.gardener.cloud:5007"]
{{- end -}}
1 change: 0 additions & 1 deletion example/gardener-local/kind/cluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ backupBucket:

registry:
deployed: true
hostname: garden.local.gardener.cloud

networking:
ipFamily: ipv4
Expand Down
3 changes: 0 additions & 3 deletions example/gardener-local/kind/extensions/values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
registry:
hostname: gardener-extensions-control-plane

gardener:
apiserverRelay:
deployed: true
Expand Down
1 change: 0 additions & 1 deletion example/gardener-local/kind/ha-single-zone2/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ gardener:

registry:
deployed: false
hostname: gardener-local-ha-single-zone-control-plane

workers:
- zone: "0"
Expand Down
3 changes: 0 additions & 3 deletions example/gardener-local/kind/operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ gardener:
garden:
deployed: true

registry:
hostname: gardener-operator-local-control-plane

workers:
- zone: "1"
- zone: "2"

0 comments on commit a89de8d

Please sign in to comment.