Skip to content

Commit ce52228

Browse files
authored
Revert "[cozystack-controller] Ancestor tracking webhook"
1 parent 65a734b commit ce52228

12 files changed

Lines changed: 1 addition & 686 deletions

File tree

‎cmd/cozystack-controller/main.go‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import (
3838

3939
cozystackiov1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
4040
"github.com/cozystack/cozystack/internal/controller"
41-
lcw "github.com/cozystack/cozystack/internal/lineagecontrollerwebhook"
4241
"github.com/cozystack/cozystack/internal/telemetry"
4342

4443
helmv2 "github.com/fluxcd/helm-controller/api/v2"
@@ -215,20 +214,6 @@ func main() {
215214
os.Exit(1)
216215
}
217216

218-
// special one that's both a webhook and a reconciler
219-
lineageControllerWebhook := &lcw.LineageControllerWebhook{
220-
Client: mgr.GetClient(),
221-
Scheme: mgr.GetScheme(),
222-
}
223-
if err := lineageControllerWebhook.SetupWithManagerAsController(mgr); err != nil {
224-
setupLog.Error(err, "unable to setup controller", "controller", "LineageController")
225-
os.Exit(1)
226-
}
227-
if err := lineageControllerWebhook.SetupWithManagerAsWebhook(mgr); err != nil {
228-
setupLog.Error(err, "unable to setup webhook", "webhook", "LineageWebhook")
229-
os.Exit(1)
230-
}
231-
232217
// +kubebuilder:scaffold:builder
233218

234219
if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {

‎internal/lineagecontrollerwebhook/config.go‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎internal/lineagecontrollerwebhook/controller.go‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎internal/lineagecontrollerwebhook/types.go‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎internal/lineagecontrollerwebhook/webhook.go‎

Lines changed: 0 additions & 166 deletions
This file was deleted.

‎packages/system/cozystack-controller/templates/certmanager.yaml‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎packages/system/cozystack-controller/templates/deployment.yaml‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: cozystack-controller
5+
namespace: cozy-system
56
labels:
67
app: cozystack-controller
78
spec:
@@ -28,15 +29,3 @@ spec:
2829
{{- if .Values.cozystackController.disableTelemetry }}
2930
- --disable-telemetry
3031
{{- end }}
31-
ports:
32-
- name: webhook
33-
containerPort: 9443
34-
volumeMounts:
35-
- name: webhook-certs
36-
mountPath: /tmp/k8s-webhook-server/serving-certs
37-
readOnly: true
38-
volumes:
39-
- name: webhook-certs
40-
secret:
41-
secretName: cozystack-controller-webhook-cert
42-
defaultMode: 0400

0 commit comments

Comments
 (0)