Update dependencies, some minor modifications to cope with changed APIs.

cfgloader/loader.go

@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
 	"github.com/G-Research/prometheus-config-loader/cfgloader/rulefmt"
+	"github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	"gopkg.in/yaml.v2"
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
@@ -109,13 +109,15 @@ func ParseRuleSpec(data []byte) (v1.PrometheusRuleSpec, error) {
 	}
 
 	for _, g := range intermediate.Groups {
-		rg := v1.RuleGroup{Name: g.Name, Interval: g.Interval}
+		interval := v1.Duration(g.Interval)
+		rg := v1.RuleGroup{Name: g.Name, Interval: &interval}
 		for _, r := range g.Rules {
+			duration := v1.Duration(r.For)
 			tmp := v1.Rule{
 				Record:      r.Record,
 				Alert:       r.Alert,
 				Expr:        intstr.FromString(r.Expr),
-				For:         r.For,
+				For:         &duration,
 				Labels:      r.Labels,
 				Annotations: r.Annotations,
 			}

cmd/prometheus-config-loader/main.go

@@ -6,6 +6,7 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"flag"
 	"fmt"
@@ -14,7 +15,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	monitoringv1 "github.com/coreos/prometheus-operator/pkg/client/versioned"
+	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/clientcmd"
 	clientapi "k8s.io/client-go/tools/clientcmd/api"
@@ -126,16 +127,25 @@ func uploadPrometheusRules(t templates.TemplateData, c *clientapi.Config, dryRun
 		return
 	}
 
+	ctx := context.Background()
+	var cOpts metav1.CreateOptions
+	var gOpts metav1.GetOptions
+	var uOpts metav1.UpdateOptions
+
 	for _, rule := range rules.Items {
 		log.Printf("Uploading rule %s to namespace %s, in context %s", rule.GetName(), namespace, t.Context)
-		_, err := api.MonitoringV1().PrometheusRules(namespace).Create(rule)
+		_, err := api.MonitoringV1().PrometheusRules(namespace).Create(ctx, rule, cOpts)
+		if err != nil {
+			log.Printf("Error when trying to create %s: %s", rule.GetName(), err)
+		}
+
 		if err != nil {
-			p, err := api.MonitoringV1().PrometheusRules(namespace).Get(rule.GetName(), metav1.GetOptions{})
+			p, err := api.MonitoringV1().PrometheusRules(namespace).Get(ctx, rule.GetName(), gOpts)
 			if err != nil {
 				log.Fatalf("Failed to get %s when trying to update: %s", rule.GetName(), err)
 			}
 			rule.SetResourceVersion(p.GetResourceVersion())
-			_, err = api.MonitoringV1().PrometheusRules(namespace).Update(rule)
+			_, err = api.MonitoringV1().PrometheusRules(namespace).Update(ctx, rule, uOpts)
 			if err != nil {
 				oldBuf, _ := json.MarshalIndent(p, "", "  ")
 				newBuf, _ := json.MarshalIndent(rule, "", "  ")

go.mod

@@ -1,22 +1,54 @@
 module github.com/G-Research/prometheus-config-loader
 
+go 1.23.1
+
+require (
+	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.77.1
+	github.com/prometheus-operator/prometheus-operator/pkg/client v0.77.1
+	gopkg.in/yaml.v2 v2.4.0
+	k8s.io/apimachinery v0.31.1
+	k8s.io/client-go v0.31.1
+)
+
 require (
-	github.com/coreos/prometheus-operator v0.29.0
-	github.com/go-openapi/spec v0.19.0 // indirect
-	github.com/gogo/protobuf v1.2.1 // indirect
-	github.com/google/btree v1.0.0 // indirect
-	github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
-	github.com/hashicorp/golang-lru v0.5.1 // indirect
-	github.com/imdario/mergo v0.3.7 // indirect
-	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
-	golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 // indirect
-	golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a // indirect
-	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/oauth2 v0.23.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/term v0.24.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/time v0.6.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.2.2
-	k8s.io/api v0.0.0-20190111032252-67edc246be36 // indirect
-	k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93
-	k8s.io/client-go v10.0.0+incompatible
-	k8s.io/kube-openapi v0.0.0-20190418160015-6b3d3b2d5666 // indirect
-	sigs.k8s.io/yaml v1.1.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/api v0.31.1 // indirect
+	k8s.io/apiextensions-apiserver v0.31.1 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
+	k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 // indirect
+	sigs.k8s.io/controller-runtime v0.19.0 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )