Skip to content

Commit 1ea7d6d

Browse files
authored
Rename "scrapeconfigs" Package to "parcascrapeconfig" (#5)
The "scrapeconfigs" package was renamed to "parcascrapeconfig" to follow the naming of the controller.
1 parent 645dba7 commit 1ea7d6d

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

controllers/scrapeconfigs/scrapeconfigs.go controllers/parcascrapeconfig/parcascrapeconfig.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package scrapeconfigs
1+
package parcascrapeconfig
22

33
import (
44
"context"

controllers/parcascrapeconfig_controller.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"time"
77

88
parcav1alpha1 "github.com/ricoberger/parca-operator/api/v1alpha1"
9-
"github.com/ricoberger/parca-operator/controllers/scrapeconfigs"
9+
"github.com/ricoberger/parca-operator/controllers/parcascrapeconfig"
1010

1111
corev1 "k8s.io/api/core/v1"
1212
"k8s.io/apimachinery/pkg/api/errors"
@@ -50,7 +50,7 @@ type ParcaScrapeConfigReconciler struct {
5050
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.14.1/pkg/reconcile
5151
func (r *ParcaScrapeConfigReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
5252
reqLogger := log.FromContext(ctx)
53-
reconciliationInterval := scrapeconfigs.GetReconciliationInterval()
53+
reconciliationInterval := parcascrapeconfig.GetReconciliationInterval()
5454

5555
parcaScrapeConfig := &parcav1alpha1.ParcaScrapeConfig{}
5656
err := r.Get(ctx, req.NamespacedName, parcaScrapeConfig)
@@ -73,14 +73,14 @@ func (r *ParcaScrapeConfigReconciler) Reconcile(ctx context.Context, req ctrl.Re
7373
if controllerutil.ContainsFinalizer(parcaScrapeConfig, parcaScrapeConfigFinalizer) {
7474
// Remove the ParcaScrapeConfig from the Parca configuration and update the Parca configuration secret. So
7575
// that it doesn't contain the ParcaScrapeConfig anymore.
76-
err := scrapeconfigs.DeleteScrapeConfig(*parcaScrapeConfig)
76+
err := parcascrapeconfig.DeleteScrapeConfig(*parcaScrapeConfig)
7777
if err != nil {
7878
reqLogger.Error(err, "Failed to delete ParcaScrapeConfig.")
7979
r.updateConditions(ctx, parcaScrapeConfig, parcaScrapeConfigDeleteFailed, err.Error(), metav1.ConditionFalse, nil)
8080
return ctrl.Result{RequeueAfter: reconciliationInterval}, err
8181
}
8282

83-
finalConfig, err := scrapeconfigs.GetConfig()
83+
finalConfig, err := parcascrapeconfig.GetConfig()
8484
if err != nil {
8585
reqLogger.Error(err, "Failed to get Parca configuration.")
8686
r.updateConditions(ctx, parcaScrapeConfig, parcaScrapeConfigUpdateFailed, err.Error(), metav1.ConditionFalse, nil)
@@ -135,7 +135,7 @@ func (r *ParcaScrapeConfigReconciler) Reconcile(ctx context.Context, req ctrl.Re
135135
return ctrl.Result{RequeueAfter: reconciliationInterval}, err
136136
}
137137

138-
podIPs, err := scrapeconfigs.SetScrapeConfig(*parcaScrapeConfig, pods.Items)
138+
podIPs, err := parcascrapeconfig.SetScrapeConfig(*parcaScrapeConfig, pods.Items)
139139
if err != nil {
140140
reqLogger.Error(err, "Failed to update internal Parca configuration.")
141141
r.updateConditions(ctx, parcaScrapeConfig, parcaScrapeConfigUpdateFailed, err.Error(), metav1.ConditionFalse, nil)
@@ -144,7 +144,7 @@ func (r *ParcaScrapeConfigReconciler) Reconcile(ctx context.Context, req ctrl.Re
144144

145145
// When the Parca configuration was updated, we can update the Parca configuration secret to include the new scrape
146146
// configuration.
147-
finalConfig, err := scrapeconfigs.GetConfig()
147+
finalConfig, err := parcascrapeconfig.GetConfig()
148148
if err != nil {
149149
reqLogger.Error(err, "Failed to get Parca configuration.")
150150
r.updateConditions(ctx, parcaScrapeConfig, parcaScrapeConfigUpdateFailed, err.Error(), metav1.ConditionFalse, nil)

main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
parcav1alpha1 "github.com/ricoberger/parca-operator/api/v1alpha1"
88
"github.com/ricoberger/parca-operator/controllers"
9-
"github.com/ricoberger/parca-operator/controllers/scrapeconfigs"
9+
"github.com/ricoberger/parca-operator/controllers/parcascrapeconfig"
1010

1111
//+kubebuilder:scaffold:imports
1212

@@ -47,7 +47,7 @@ func main() {
4747

4848
ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
4949

50-
err := scrapeconfigs.Init()
50+
err := parcascrapeconfig.Init()
5151
if err != nil {
5252
setupLog.Error(err, "Failed to initialize Parca configuration.")
5353
os.Exit(1)

0 commit comments

Comments
 (0)