Skip to content

Commit 5b46a05

Browse files
darkowlzzdarkowlzz
committed
Update all the references of NC v1beta2 to v1beta3
Signed-off-by: Sunny <darkowlzz@protonmail.com>
1 parent c004099 commit 5b46a05

33 files changed

+124
-123
lines changed

‎cmd/flux/alert.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"sigs.k8s.io/controller-runtime/pkg/client"
2121

22-
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta2"
22+
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta3"
2323
)
2424

2525
// notificationv1.Alert

‎cmd/flux/alert_provider.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"sigs.k8s.io/controller-runtime/pkg/client"
2121

22-
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta2"
22+
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta3"
2323
)
2424

2525
// notificationv1.Provider

‎cmd/flux/create_alert.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"sigs.k8s.io/controller-runtime/pkg/client"
2929

3030
notificationv1 "github.com/fluxcd/notification-controller/api/v1"
31-
notificationv1b2 "github.com/fluxcd/notification-controller/api/v1beta2"
31+
notificationv1b3 "github.com/fluxcd/notification-controller/api/v1beta3"
3232
"github.com/fluxcd/pkg/apis/meta"
3333

3434
"github.com/fluxcd/flux2/v2/internal/utils"
@@ -96,13 +96,13 @@ func createAlertCmdRun(cmd *cobra.Command, args []string) error {
9696
logger.Generatef("generating Alert")
9797
}
9898

99-
alert := notificationv1b2.Alert{
99+
alert := notificationv1b3.Alert{
100100
ObjectMeta: metav1.ObjectMeta{
101101
Name: name,
102102
Namespace: *kubeconfigArgs.Namespace,
103103
Labels: sourceLabels,
104104
},
105-
Spec: notificationv1b2.AlertSpec{
105+
Spec: notificationv1b3.AlertSpec{
106106
ProviderRef: meta.LocalObjectReference{
107107
Name: alertArgs.providerRef,
108108
},
@@ -140,13 +140,13 @@ func createAlertCmdRun(cmd *cobra.Command, args []string) error {
140140
}
141141

142142
func upsertAlert(ctx context.Context, kubeClient client.Client,
143-
alert *notificationv1b2.Alert) (types.NamespacedName, error) {
143+
alert *notificationv1b3.Alert) (types.NamespacedName, error) {
144144
namespacedName := types.NamespacedName{
145145
Namespace: alert.GetNamespace(),
146146
Name: alert.GetName(),
147147
}
148148

149-
var existing notificationv1b2.Alert
149+
var existing notificationv1b3.Alert
150150
err := kubeClient.Get(ctx, namespacedName, &existing)
151151
if err != nil {
152152
if errors.IsNotFound(err) {

‎cmd/flux/create_alertprovider.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"k8s.io/apimachinery/pkg/util/wait"
2828
"sigs.k8s.io/controller-runtime/pkg/client"
2929

30-
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta2"
30+
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta3"
3131
"github.com/fluxcd/pkg/apis/meta"
3232

3333
"github.com/fluxcd/flux2/v2/internal/utils"

‎cmd/flux/delete_alert.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"github.com/spf13/cobra"
2121

22-
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta2"
22+
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta3"
2323
)
2424

2525
var deleteAlertCmd = &cobra.Command{

‎cmd/flux/delete_alertprovider.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"github.com/spf13/cobra"
2121

22-
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta2"
22+
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta3"
2323
)
2424

2525
var deleteAlertProviderCmd = &cobra.Command{

‎cmd/flux/events.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import (
4444
imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
4545
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
4646
notificationv1 "github.com/fluxcd/notification-controller/api/v1"
47-
notificationv1b2 "github.com/fluxcd/notification-controller/api/v1beta2"
47+
notificationv1b3 "github.com/fluxcd/notification-controller/api/v1beta3"
4848
sourcev1 "github.com/fluxcd/source-controller/api/v1"
4949
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
5050

@@ -426,14 +426,14 @@ var fluxKindMap = refMap{
426426
},
427427
field: []string{"spec", "chart", "spec", "sourceRef"},
428428
},
429-
notificationv1b2.AlertKind: {
430-
gvk: notificationv1b2.GroupVersion.WithKind(notificationv1b2.AlertKind),
431-
kind: notificationv1b2.ProviderKind,
429+
notificationv1b3.AlertKind: {
430+
gvk: notificationv1b3.GroupVersion.WithKind(notificationv1b3.AlertKind),
431+
kind: notificationv1b3.ProviderKind,
432432
crossNamespaced: false,
433433
field: []string{"spec", "providerRef"},
434434
},
435435
notificationv1.ReceiverKind: {gvk: notificationv1.GroupVersion.WithKind(notificationv1.ReceiverKind)},
436-
notificationv1b2.ProviderKind: {gvk: notificationv1b2.GroupVersion.WithKind(notificationv1b2.ProviderKind)},
436+
notificationv1b3.ProviderKind: {gvk: notificationv1b3.GroupVersion.WithKind(notificationv1b3.ProviderKind)},
437437
imagev1.ImagePolicyKind: {
438438
gvk: imagev1.GroupVersion.WithKind(imagev1.ImagePolicyKind),
439439
kind: imagev1.ImageRepositoryKind,

‎cmd/flux/events_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
3737
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
3838
notificationv1 "github.com/fluxcd/notification-controller/api/v1"
39-
notificationv1b2 "github.com/fluxcd/notification-controller/api/v1beta2"
39+
notificationv1b3 "github.com/fluxcd/notification-controller/api/v1beta3"
4040
eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1"
4141
"github.com/fluxcd/pkg/ssa"
4242
sourcev1 "github.com/fluxcd/source-controller/api/v1"
@@ -127,7 +127,7 @@ spec:
127127
name: podinfo-chart
128128
version: '*'
129129
---
130-
apiVersion: notification.toolkit.fluxcd.io/v1beta2
130+
apiVersion: notification.toolkit.fluxcd.io/v1beta3
131131
kind: Alert
132132
metadata:
133133
name: webapp
@@ -140,7 +140,7 @@ spec:
140140
providerRef:
141141
name: slack
142142
---
143-
apiVersion: notification.toolkit.fluxcd.io/v1beta2
143+
apiVersion: notification.toolkit.fluxcd.io/v1beta3
144144
kind: Provider
145145
metadata:
146146
name: slack
@@ -416,7 +416,7 @@ func getScheme() *runtime.Scheme {
416416
kustomizev1.AddToScheme(newscheme)
417417
helmv2beta1.AddToScheme(newscheme)
418418
notificationv1.AddToScheme(newscheme)
419-
notificationv1b2.AddToScheme(newscheme)
419+
notificationv1b3.AddToScheme(newscheme)
420420
imagev1.AddToScheme(newscheme)
421421
autov1.AddToScheme(newscheme)
422422
sourcev1.AddToScheme(newscheme)

‎cmd/flux/export_alert.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/spf13/cobra"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222

23-
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta2"
23+
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta3"
2424
)
2525

2626
var exportAlertCmd = &cobra.Command{

‎cmd/flux/export_alertprovider.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/spf13/cobra"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222

23-
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta2"
23+
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta3"
2424
)
2525

2626
var exportAlertProviderCmd = &cobra.Command{

‎cmd/flux/get_alert.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/apimachinery/pkg/runtime"
2828

29-
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta2"
29+
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta3"
3030
)
3131

3232
var getAlertCmd = &cobra.Command{
@@ -92,6 +92,5 @@ func (s alertListAdapter) headers(includeNamespace bool) []string {
9292
}
9393

9494
func (s alertListAdapter) statusSelectorMatches(i int, conditionType, conditionStatus string) bool {
95-
item := s.Items[i]
96-
return statusMatches(conditionType, conditionStatus, item.Status.Conditions)
95+
return false
9796
}

‎cmd/flux/get_alertprovider.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2424
"k8s.io/apimachinery/pkg/runtime"
2525

26-
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta2"
26+
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta3"
2727
)
2828

2929
var getAlertProviderCmd = &cobra.Command{
@@ -88,6 +88,5 @@ func (s alertProviderListAdapter) headers(includeNamespace bool) []string {
8888
}
8989

9090
func (s alertProviderListAdapter) statusSelectorMatches(i int, conditionType, conditionStatus string) bool {
91-
item := s.Items[i]
92-
return statusMatches(conditionType, conditionStatus, item.Status.Conditions)
91+
return false
9392
}

‎cmd/flux/get_all.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
2525
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
2626
notificationv1 "github.com/fluxcd/notification-controller/api/v1"
27-
notificationv1b2 "github.com/fluxcd/notification-controller/api/v1beta2"
27+
notificationv1b3 "github.com/fluxcd/notification-controller/api/v1beta3"
2828
)
2929

3030
var getAllCmd = &cobra.Command{
@@ -63,11 +63,11 @@ var getAllCmd = &cobra.Command{
6363
},
6464
{
6565
apiType: alertProviderType,
66-
list: alertProviderListAdapter{&notificationv1b2.ProviderList{}},
66+
list: alertProviderListAdapter{&notificationv1b3.ProviderList{}},
6767
},
6868
{
6969
apiType: alertType,
70-
list: &alertListAdapter{&notificationv1b2.AlertList{}},
70+
list: &alertListAdapter{&notificationv1b3.AlertList{}},
7171
},
7272
}
7373

‎cmd/flux/main_test.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
"github.com/fluxcd/flux2/v2/internal/utils"
3535
"github.com/google/go-cmp/cmp"
3636
"github.com/mattn/go-shellwords"
37+
"k8s.io/apimachinery/pkg/api/errors"
3738
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
3839
k8syaml "k8s.io/apimachinery/pkg/util/yaml"
3940
"k8s.io/client-go/tools/clientcmd"
@@ -112,7 +113,8 @@ func (m *testEnvKubeManager) CreateObjects(clientObjects []*unstructured.Unstruc
112113
}
113114
obj.SetResourceVersion(createObj.GetResourceVersion())
114115
err = m.client.Status().Update(context.Background(), obj)
115-
if err != nil {
116+
// Updating status of static objects results in not found error.
117+
if err != nil && !errors.IsNotFound(err) {
116118
return err
117119
}
118120
}

‎cmd/flux/resume_alert.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"github.com/spf13/cobra"
2121

22-
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta2"
22+
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta3"
2323
)
2424

2525
var resumeAlertCmd = &cobra.Command{
@@ -44,7 +44,7 @@ func init() {
4444
}
4545

4646
func (obj alertAdapter) getObservedGeneration() int64 {
47-
return obj.Alert.Status.ObservedGeneration
47+
return 0
4848
}
4949

5050
func (obj alertAdapter) setUnsuspended() {

‎cmd/flux/resume_alertprovider.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"github.com/spf13/cobra"
2121

22-
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta2"
22+
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta3"
2323
)
2424

2525
var resumeAlertProviderCmd = &cobra.Command{
@@ -44,7 +44,7 @@ func init() {
4444
}
4545

4646
func (obj alertProviderAdapter) getObservedGeneration() int64 {
47-
return obj.Provider.Status.ObservedGeneration
47+
return 0
4848
}
4949

5050
func (obj alertProviderAdapter) setUnsuspended() {

‎cmd/flux/stats.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
3333
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
3434
notificationv1 "github.com/fluxcd/notification-controller/api/v1"
35-
notificationv1b2 "github.com/fluxcd/notification-controller/api/v1beta2"
35+
notificationv1b3 "github.com/fluxcd/notification-controller/api/v1beta3"
3636
sourcev1 "github.com/fluxcd/source-controller/api/v1"
3737
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
3838

@@ -111,14 +111,14 @@ func runStatsCmd(cmd *cobra.Command, args []string) error {
111111
Group: helmv2.GroupVersion.Group,
112112
},
113113
{
114-
Kind: notificationv1b2.AlertKind,
115-
Version: notificationv1b2.GroupVersion.Version,
116-
Group: notificationv1b2.GroupVersion.Group,
114+
Kind: notificationv1b3.AlertKind,
115+
Version: notificationv1b3.GroupVersion.Version,
116+
Group: notificationv1b3.GroupVersion.Group,
117117
},
118118
{
119-
Kind: notificationv1b2.ProviderKind,
120-
Version: notificationv1b2.GroupVersion.Version,
121-
Group: notificationv1b2.GroupVersion.Group,
119+
Kind: notificationv1b3.ProviderKind,
120+
Version: notificationv1b3.GroupVersion.Version,
121+
Group: notificationv1b3.GroupVersion.Group,
122122
},
123123
{
124124
Kind: notificationv1.ReceiverKind,

‎cmd/flux/suspend_alert.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"github.com/spf13/cobra"
2121

22-
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta2"
22+
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta3"
2323
)
2424

2525
var suspendAlertCmd = &cobra.Command{

‎cmd/flux/suspend_alertprovider.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"github.com/spf13/cobra"
2121

22-
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta2"
22+
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta3"
2323
)
2424

2525
var suspendAlertProviderCmd = &cobra.Command{

‎cmd/flux/testdata/export/alert.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: notification.toolkit.fluxcd.io/v1beta2
2+
apiVersion: notification.toolkit.fluxcd.io/v1beta3
33
kind: Alert
44
metadata:
55
name: flux-system

‎cmd/flux/testdata/export/objects.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: Namespace
44
metadata:
55
name: {{ .fluxns }}
66
---
7-
apiVersion: notification.toolkit.fluxcd.io/v1beta2
7+
apiVersion: notification.toolkit.fluxcd.io/v1beta3
88
kind: Provider
99
metadata:
1010
name: slack
@@ -14,7 +14,7 @@ spec:
1414
channel: 'A channel with spacess'
1515
address: https://hooks.slack.com/services/mock
1616
---
17-
apiVersion: notification.toolkit.fluxcd.io/v1beta2
17+
apiVersion: notification.toolkit.fluxcd.io/v1beta3
1818
kind: Alert
1919
metadata:
2020
name: flux-system

‎cmd/flux/testdata/export/provider.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: notification.toolkit.fluxcd.io/v1beta2
2+
apiVersion: notification.toolkit.fluxcd.io/v1beta3
33
kind: Provider
44
metadata:
55
name: slack

0 commit comments

Comments
 (0)