From 2544bfd7d70610570bd16ad5fc5be3adb0b31675 Mon Sep 17 00:00:00 2001 From: Bence Csati Date: Tue, 26 Nov 2024 16:47:10 +0100 Subject: [PATCH 1/2] chore: use none const for headless metrics svc's Signed-off-by: Bence Csati --- pkg/resources/fluentbit/service.go | 4 ++-- pkg/resources/fluentd/service.go | 4 ++-- pkg/resources/nodeagent/service.go | 2 +- pkg/resources/syslogng/service.go | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/resources/fluentbit/service.go b/pkg/resources/fluentbit/service.go index 27fdf5fa7..cd2695ab9 100644 --- a/pkg/resources/fluentbit/service.go +++ b/pkg/resources/fluentbit/service.go @@ -39,7 +39,7 @@ func (r *Reconciler) serviceMetrics() (runtime.Object, reconciler.DesiredState, }, Selector: r.getFluentBitLabels(), Type: corev1.ServiceTypeClusterIP, - ClusterIP: "None", + ClusterIP: corev1.ClusterIPNone, }, }, reconciler.StatePresent, nil } @@ -107,7 +107,7 @@ func (r *Reconciler) serviceBufferMetrics() (runtime.Object, reconciler.DesiredS }, Selector: r.getFluentBitLabels(), Type: corev1.ServiceTypeClusterIP, - ClusterIP: "None", + ClusterIP: corev1.ClusterIPNone, }, }, reconciler.StatePresent, nil } diff --git a/pkg/resources/fluentd/service.go b/pkg/resources/fluentd/service.go index c89465add..830497da3 100644 --- a/pkg/resources/fluentd/service.go +++ b/pkg/resources/fluentd/service.go @@ -74,7 +74,7 @@ func (r *Reconciler) serviceMetrics() (runtime.Object, reconciler.DesiredState, }, Selector: r.Logging.GetFluentdLabels(ComponentFluentd, *r.fluentdSpec), Type: corev1.ServiceTypeClusterIP, - ClusterIP: "None", + ClusterIP: corev1.ClusterIPNone, }, }, reconciler.StatePresent, nil } @@ -142,7 +142,7 @@ func (r *Reconciler) serviceBufferMetrics() (runtime.Object, reconciler.DesiredS }, Selector: r.Logging.GetFluentdLabels(ComponentFluentd, *r.fluentdSpec), Type: corev1.ServiceTypeClusterIP, - ClusterIP: "None", + ClusterIP: corev1.ClusterIPNone, }, }, reconciler.StatePresent, nil } diff --git a/pkg/resources/nodeagent/service.go b/pkg/resources/nodeagent/service.go index 28217da74..a69ae0e21 100644 --- a/pkg/resources/nodeagent/service.go +++ b/pkg/resources/nodeagent/service.go @@ -41,7 +41,7 @@ func (n *nodeAgentInstance) serviceMetrics() (runtime.Object, reconciler.Desired }, Selector: n.getFluentBitLabels(), Type: corev1.ServiceTypeClusterIP, - ClusterIP: "None", + ClusterIP: corev1.ClusterIPNone, }, } err := merge.Merge(desired, n.nodeAgent.FluentbitSpec.MetricsService) diff --git a/pkg/resources/syslogng/service.go b/pkg/resources/syslogng/service.go index ca7845f87..75b4ab66d 100644 --- a/pkg/resources/syslogng/service.go +++ b/pkg/resources/syslogng/service.go @@ -74,7 +74,7 @@ func (r *Reconciler) serviceMetrics() (runtime.Object, reconciler.DesiredState, }, Selector: r.Logging.GetSyslogNGLabels(ComponentSyslogNG), Type: corev1.ServiceTypeClusterIP, - ClusterIP: "None", + ClusterIP: corev1.ClusterIPNone, }, }, reconciler.StatePresent, nil } @@ -141,7 +141,7 @@ func (r *Reconciler) serviceBufferMetrics() (runtime.Object, reconciler.DesiredS }, Selector: r.Logging.GetSyslogNGLabels(ComponentSyslogNG), Type: corev1.ServiceTypeClusterIP, - ClusterIP: "None", + ClusterIP: corev1.ClusterIPNone, }, }, reconciler.StatePresent, nil } From 1b405c579f97574c87dfb8b351f9140088d0af07 Mon Sep 17 00:00:00 2001 From: Bence Csati Date: Tue, 26 Nov 2024 16:47:44 +0100 Subject: [PATCH 2/2] chore(dev-env): add devspace to ignore Signed-off-by: Bence Csati --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index dcd82112f..55dec88a4 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,7 @@ example/tls-cluster-forward/*.key .DS_Store go.work.sum + +# Ignore DevSpace cache and log folder and DevSpace configuration file +.devspace/ +devspace.yaml