Skip to content

Commit 6aeb587

Browse files
fix: NotifierRefs are no longer NamespacedNames
1 parent 5fa0f8e commit 6aeb587

5 files changed

Lines changed: 2 additions & 12 deletions

File tree

api/v1alpha1/general_types.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,4 @@ package v1alpha1
44
type ResourceRef struct {
55
// +kubebuilder:validation:Required
66
Name string `json:"name"`
7-
8-
// +kubebuilder:validation:Required
9-
Namespace string `json:"namespace"`
107
}

config/crd/bases/ddns.stefangenov.site_providers.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,8 @@ spec:
5656
properties:
5757
name:
5858
type: string
59-
namespace:
60-
type: string
6159
required:
6260
- name
63-
- namespace
6461
type: object
6562
type: array
6663
secretName:

config/samples/ddns_v1alpha1_provider.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ spec:
1111
configMap: cloudflare-config
1212
notifierRefs:
1313
- name: webhook-notifier
14-
namespace: go-ddns-controller-system

dist/install.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,11 +224,8 @@ spec:
224224
properties:
225225
name:
226226
type: string
227-
namespace:
228-
type: string
229227
required:
230228
- name
231-
- namespace
232229
type: object
233230
type: array
234231
secretName:

internal/controller/notifier_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func (r *NotifierReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
8585
filteredProviders := []ddnsv1alpha1.Provider{}
8686
for _, provider := range providers.Items {
8787
for _, ref := range provider.Spec.NotifierRefs {
88-
if ref.Name == req.Name && ref.Namespace == req.Namespace {
88+
if ref.Name == req.Name {
8989
filteredProviders = append(filteredProviders, provider)
9090
break
9191
}
@@ -384,7 +384,7 @@ func (r *NotifierReconciler) findObjectsForProvider(ctx context.Context, provide
384384
requests[i] = reconcile.Request{
385385
NamespacedName: types.NamespacedName{
386386
Name: notifierRef.Name,
387-
Namespace: notifierRef.Namespace,
387+
Namespace: provider.GetNamespace(),
388388
},
389389
}
390390
}

0 commit comments

Comments
 (0)