Skip to content

Commit 82f52ea

Browse files
committed
rename extension to gardener-extension-shoot-traefik
1 parent caf7d18 commit 82f52ea

29 files changed

Lines changed: 84 additions & 376 deletions

File tree

.github/workflows/build-and-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ jobs:
6565
uses: docker/build-push-action@v6
6666
with:
6767
push: false
68-
tags: gardener-extension-traefik:latest
68+
tags: gardener-extension-shoot-traefik:latest

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# gardener-extension-traefik maintainers
1+
# gardener-extension-shoot-traefik maintainers
22
* @gardener/gardener-extension-traefik-maintainers

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ ARG BUILD_DATE
3030
ARG VERSION
3131
ARG REVISION
3232

33-
LABEL org.opencontainers.image.title="Gardener Extension Traefik"
33+
LABEL org.opencontainers.image.title="Gardener Extension Shoot Traefik"
3434
LABEL org.opencontainers.image.version="${VERSION}"
35-
LABEL org.opencontainers.image.description="A Gardener extension for Traefik"
36-
LABEL org.opencontainers.image.source="https://github.com/dnaeon/gardener-extension-traefik"
35+
LABEL org.opencontainers.image.description="A Gardener shoot extension for Traefik"
36+
LABEL org.opencontainers.image.source="https://github.com/gardener/gardener-extension-shoot-traefik"
3737
LABEL org.opencontainers.image.created="${BUILD_DATE}"
3838
LABEL org.opencontainers.image.revision="${REVISION}"
3939
LABEL org.opencontainers.image.licenses="Apache-2.0"
40-
LABEL org.opencontainers.image.authors="@gardener/gardener-extension-traefik-maintainers"
40+
LABEL org.opencontainers.image.authors="@gardener/gardener-extension-shoot-traefik-maintainers"
4141

4242
WORKDIR /
4343
COPY --from=builder /workspace/bin/extension-traefik /usr/local/bin/extension-traefik

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ifneq ($(strip $(shell git status --porcelain 2>/dev/null)),)
2727
endif
2828

2929
# Name and version of the Gardener extension.
30-
EXTENSION_NAME ?= gardener-extension-traefik
30+
EXTENSION_NAME ?= gardener-extension-shoot-traefik
3131
EXTENSION_TYPE ?= traefik
3232

3333
# Name for the extension image
@@ -93,7 +93,7 @@ $(1)
9393

9494
endef
9595

96-
##@ gardener-extension-traefik
96+
##@ gardener-extension-shoot-traefik
9797

9898
.PHONY: help
9999
help: ## Display this help.

README.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# gardener-extension-traefik
1+
# gardener-extension-shoot-traefik
22

3-
The `gardener-extension-traefik` deploys Traefik ingress controller to Gardener shoot clusters as a replacement for the nginx-ingress-controller which is out of maintenance.
3+
The `gardener-extension-shoot-traefik` deploys Traefik ingress controller to Gardener shoot clusters as a replacement for the nginx-ingress-controller which is out of maintenance.
44

55
## Features
66

@@ -84,7 +84,7 @@ command.
8484
make docker-build
8585
```
8686

87-
For local development of the `gardener-extension-traefik` it is recommended that
87+
For local development of the `gardener-extension-shoot-traefik` it is recommended that
8888
you setup a [development Gardener environment](https://gardener.cloud/docs/gardener/local_setup/).
8989

9090
Please refer to the next sections for more information about deploying and
@@ -164,12 +164,12 @@ Verify that we have successfully created the `ControllerDeployment` and
164164
`ControllerRegistration` resources.
165165

166166
``` shell
167-
$ kubectl get controllerregistrations,controllerdeployments gardener-extension-traefik
168-
NAME RESOURCES AGE
169-
controllerregistration.core.gardener.cloud/gardener-extension-traefik Extension/traefik 40s
167+
$ kubectl get controllerregistrations,controllerdeployments gardener-extension-shoot-traefik
168+
NAME RESOURCES AGE
169+
controllerregistration.core.gardener.cloud/gardener-extension-shoot-traefik Extension/traefik 40s
170170

171-
NAME AGE
172-
controllerdeployment.core.gardener.cloud/gardener-extension-traefik 40s
171+
NAME AGE
172+
controllerdeployment.core.gardener.cloud/gardener-extension-shoot-traefik 40s
173173
```
174174

175175
Finally, we can create an example shoot with our extension enabled. The
@@ -181,15 +181,15 @@ kubectl apply -f examples/shoot.yaml
181181
```
182182

183183
Once we create the shoot cluster, `gardenlet` will start deploying our
184-
`gardener-extension-traefik`, since it is required by our shoot.
184+
`gardener-extension-shoot-traefik`, since it is required by our shoot.
185185

186186
Verify that the extension has been successfully installed by checking the
187187
corresponding `ControllerInstallation` resource.
188188

189189
``` shell
190190
$ kubectl get controllerinstallations.core.gardener.cloud
191-
NAME REGISTRATION SEED VALID INSTALLED HEALTHY PROGRESSING AGE
192-
gardener-extension-traefik-tktwt gardener-extension-traefik local True True True False 103s
191+
NAME REGISTRATION SEED VALID INSTALLED HEALTHY PROGRESSING AGE
192+
gardener-extension-shoot-traefik-tktwt gardener-extension-shoot-traefik local True True True False 103s
193193
```
194194

195195
After your shoot cluster has been successfully created and reconciled, verify
@@ -268,22 +268,22 @@ Verify that we have successfully created the
268268
`Extension` (from group `operator.gardener.cloud/v1alpha1`) resource.
269269

270270
``` shell
271-
$ kubectl --kubeconfig $KUBECONFIG_RUNTIME get extop gardener-extension-traefik
272-
NAME INSTALLED REQUIRED RUNTIME REQUIRED VIRTUAL AGE
273-
gardener-extension-traefik True False False 85s
271+
$ kubectl --kubeconfig $KUBECONFIG_RUNTIME get extop gardener-extension-shoot-traefik
272+
NAME INSTALLED REQUIRED RUNTIME REQUIRED VIRTUAL AGE
273+
gardener-extension-shoot-traefik True False False 85s
274274
```
275275

276276
Verify that the respective `ControllerRegistration` and `ControllerDeployment`
277277
resources have been created by the `gardener-operator` in the _virtual_ garden
278278
cluster.
279279

280280
``` shell
281-
> kubectl --kubeconfig $KUBECONFIG_VIRTUAL get controllerregistrations,controllerdeployments gardener-extension-traefik
282-
NAME RESOURCES AGE
283-
controllerregistration.core.gardener.cloud/gardener-extension-traefik Extension/traefik 3m50s
281+
> kubectl --kubeconfig $KUBECONFIG_VIRTUAL get controllerregistrations,controllerdeployments gardener-extension-shoot-traefik
282+
NAME RESOURCES AGE
283+
controllerregistration.core.gardener.cloud/gardener-extension-shoot-traefik Extension/traefik 3m50s
284284

285-
NAME AGE
286-
controllerdeployment.core.gardener.cloud/gardener-extension-traefik 3m50s
285+
NAME AGE
286+
controllerdeployment.core.gardener.cloud/gardener-extension-shoot-traefik 3m50s
287287
```
288288

289289
Now we can create an example shoot with our extension enabled. The
@@ -295,15 +295,15 @@ kubectl --kubeconfig $KUBECONFIG_VIRTUAL apply -f examples/shoot.yaml
295295
```
296296

297297
Once we create the shoot cluster, `gardenlet` will start deploying our
298-
`gardener-extension-traefik`, since it is required by our shoot.
298+
`gardener-extension-shoot-traefik`, since it is required by our shoot.
299299

300300
Verify that the extension has been successfully installed by checking the
301301
corresponding `ControllerInstallation` resource for our extension.
302302

303303
``` shell
304304
$ kubectl --kubeconfig $KUBECONFIG_VIRTUAL get controllerinstallations.core.gardener.cloud
305-
NAME REGISTRATION SEED VALID INSTALLED HEALTHY PROGRESSING AGE
306-
gardener-extension-traefik-ng4r8 gardener-extension-traefik local True True True False 2m9s
305+
NAME REGISTRATION SEED VALID INSTALLED HEALTHY PROGRESSING AGE
306+
gardener-extension-shoot-traefik-ng4r8 gardener-extension-shoot-traefik local True True True False 2m9s
307307
```
308308

309309
After your shoot cluster has been successfully created and reconciled, verify
@@ -324,8 +324,8 @@ kubectl --kubeconfig $KUBECONFIG_RUNTIME --namespace shoot--local--local annotat
324324

325325
# Contributing
326326

327-
`gardener-extension-traefik` is hosted on
328-
[Github](https://github.com/dnaeon/gardener-extension-traefik).
327+
`gardener-extension-shoot-traefik` is hosted on
328+
[Github](https://github.com/gardener/gardener-extension-shoot-traefik).
329329

330330
Please contribute by reporting issues, suggesting features or by sending patches
331331
using pull requests.

charts/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
2-
name: gardener-extension-traefik
3-
description: A Helm chart for the Traefik Gardener extension that deploys Traefik ingress controller to shoot clusters
2+
name: gardener-extension-shoot-traefik
3+
description: A Helm chart for the Traefik Gardener shoot extension that deploys Traefik ingress controller to shoot clusters
44
# A chart can be either an 'application' or a 'library' chart.
55
#
66
# Application charts are a collection of templates that can be packaged into versioned archives

charts/values.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ extension:
1010
#
1111
# Also, it will be used as the name for the Deployment, Service and
1212
# ServiceAccount resources.
13-
name: gardener-extension-traefik
13+
name: gardener-extension-shoot-traefik
1414
# Logging settings.
1515
logging:
1616
# Logging level. Valid values are `info', `debug' and `error'.
@@ -48,7 +48,7 @@ extension:
4848
# Leader election settings
4949
leader_election:
5050
enabled: true
51-
election_id: gardener-extension-traefik-leader-election
51+
election_id: gardener-extension-shoot-traefik-leader-election
5252

5353
# Webhook configuration for admission validation
5454
webhook:
@@ -59,7 +59,7 @@ webhook:
5959
# Certificate directory for webhook TLS
6060
certDir: /tmp/k8s-webhook-server/serving-certs
6161
# Service name for the webhook
62-
serviceName: gardener-extension-traefik-webhook
62+
serviceName: gardener-extension-shoot-traefik-webhook
6363

6464
# Extra values provided by gardenlet during extension deployment.
6565
#
@@ -90,7 +90,7 @@ serviceAccount:
9090
#
9191
# https://kubernetes.io/docs/concepts/containers/images/
9292
image:
93-
repository: docktofuture/gardener-extension-traefik
93+
repository: docktofuture/gardener-extension-shoot-traefik
9494
# This sets the pull policy for images.
9595
pullPolicy: IfNotPresent
9696
# Overrides the image tag whose default is the chart appVersion.

cmd/extension-traefik/internal/manager/manager.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ import (
2727
"sigs.k8s.io/controller-runtime/pkg/healthz"
2828
ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
2929

30-
extenimagev "gardener-extension-traefik/imagevector"
31-
"gardener-extension-traefik/pkg/actuator"
32-
configinstall "gardener-extension-traefik/pkg/apis/config/install"
33-
"gardener-extension-traefik/pkg/controller"
34-
"gardener-extension-traefik/pkg/heartbeat"
35-
"gardener-extension-traefik/pkg/mgr"
36-
"gardener-extension-traefik/pkg/webhook"
30+
extenimagev "gardener-extension-shoot-traefik/imagevector"
31+
"gardener-extension-shoot-traefik/pkg/actuator"
32+
configinstall "gardener-extension-shoot-traefik/pkg/apis/config/install"
33+
"gardener-extension-shoot-traefik/pkg/controller"
34+
"gardener-extension-shoot-traefik/pkg/heartbeat"
35+
"gardener-extension-shoot-traefik/pkg/mgr"
36+
"gardener-extension-shoot-traefik/pkg/webhook"
3737
)
3838

3939
// flags stores the manager flags as provided from the command-line
@@ -156,7 +156,7 @@ func New() *cli.Command {
156156
&cli.StringFlag{
157157
Name: "extension-name",
158158
Usage: "name of the gardener extension",
159-
Value: "gardener-extension-traefik",
159+
Value: "gardener-extension-shoot-traefik",
160160
Sources: cli.EnvVars("EXTENSION_NAME"),
161161
Destination: &flags.extensionName,
162162
},
@@ -190,7 +190,7 @@ func New() *cli.Command {
190190
&cli.StringFlag{
191191
Name: "heartbeat-namespace",
192192
Usage: "namespace to use for the heartbeat lease",
193-
Value: "gardener-extension-traefik",
193+
Value: "gardener-extension-shoot-traefik",
194194
Sources: cli.EnvVars("HEARTBEAT_NAMESPACE"),
195195
Destination: &flags.heartbeatNamespace,
196196
},
@@ -204,14 +204,14 @@ func New() *cli.Command {
204204
&cli.StringFlag{
205205
Name: "leader-election-id",
206206
Usage: "the leader election id to use, if leader election is enabled",
207-
Value: "gardener-extension-traefik-leader-election",
207+
Value: "gardener-extension-shoot-traefik-leader-election",
208208
Sources: cli.EnvVars("LEADER_ELECTION_ID"),
209209
Destination: &flags.leaderElectionID,
210210
},
211211
&cli.StringFlag{
212212
Name: "leader-election-namespace",
213213
Usage: "namespace to use for the leader election lease",
214-
Value: "gardener-extension-traefik",
214+
Value: "gardener-extension-shoot-traefik",
215215
Sources: cli.EnvVars("LEADER_ELECTION_NAMESPACE"),
216216
Destination: &flags.leaderElectionNamespace,
217217
},

cmd/extension-traefik/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import (
1111
ctrl "sigs.k8s.io/controller-runtime"
1212
ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
1313

14-
managercmd "gardener-extension-traefik/cmd/extension-traefik/internal/manager"
15-
"gardener-extension-traefik/pkg/version"
14+
managercmd "gardener-extension-shoot-traefik/cmd/extension-traefik/internal/manager"
15+
"gardener-extension-shoot-traefik/pkg/version"
1616
)
1717

1818
func main() {
1919
app := &cli.Command{
20-
Name: "gardener-extension-traefik",
20+
Name: "gardener-extension-shoot-traefik",
2121
Version: version.Version,
2222
EnableShellCompletion: true,
2323
Usage: "traefik extension for Gardener",

examples/dev-setup/controllerdeployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
apiVersion: core.gardener.cloud/v1
33
kind: ControllerDeployment
44
metadata:
5-
name: gardener-extension-traefik
5+
name: gardener-extension-shoot-traefik
66
helm:
77
ociRepository:
8-
ref: registry.local.gardener.cloud:5001/helm-charts/gardener-extension-traefik:v0.1.0-dev
8+
ref: registry.local.gardener.cloud:5001/helm-charts/gardener-extension-shoot-traefik:v0.1.0-dev
99
values:
1010
webhook:
1111
enabled: true

0 commit comments

Comments
 (0)