Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename "scrapeconfigs" Package to "parcascrapeconfig" #5

Merged
merged 1 commit into from
Jul 24, 2023
Merged

Rename "scrapeconfigs" Package to "parcascrapeconfig" #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion controllers/scrapeconfigs/scrapeconfigs.go → ...rs/parcascrapeconfig/parcascrapeconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package scrapeconfigs
package parcascrapeconfig

import (
"context"
Expand Down
12 changes: 6 additions & 6 deletions controllers/parcascrapeconfig_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

parcav1alpha1 "github.com/ricoberger/parca-operator/api/v1alpha1"
"github.com/ricoberger/parca-operator/controllers/scrapeconfigs"
"github.com/ricoberger/parca-operator/controllers/parcascrapeconfig"

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

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

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

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

// When the Parca configuration was updated, we can update the Parca configuration secret to include the new scrape
// configuration.
finalConfig, err := scrapeconfigs.GetConfig()
finalConfig, err := parcascrapeconfig.GetConfig()
if err != nil {
reqLogger.Error(err, "Failed to get Parca configuration.")
r.updateConditions(ctx, parcaScrapeConfig, parcaScrapeConfigUpdateFailed, err.Error(), metav1.ConditionFalse, nil)
Expand Down
4 changes: 2 additions & 2 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

parcav1alpha1 "github.com/ricoberger/parca-operator/api/v1alpha1"
"github.com/ricoberger/parca-operator/controllers"
"github.com/ricoberger/parca-operator/controllers/scrapeconfigs"
"github.com/ricoberger/parca-operator/controllers/parcascrapeconfig"

//+kubebuilder:scaffold:imports

Expand Down Expand Up @@ -47,7 +47,7 @@ func main() {

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

err := scrapeconfigs.Init()
err := parcascrapeconfig.Init()
if err != nil {
setupLog.Error(err, "Failed to initialize Parca configuration.")
os.Exit(1)
Expand Down