Merge pull request #11 from cxdy/feat/v0.13.0

Feat/v0.13.0

.github/workflows/helmrelease.yaml

@@ -27,7 +27,7 @@ jobs:
           version: v3.7.1
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.4.1
+        uses: helm/chart-releaser-action@v1.6.0
         with:
           charts_dir: deploy/kubernetes/helm
         env:

CHANGELOG.md

@@ -2,10 +2,18 @@
 
 ## [Unreleased]
 
-## [v0.13.0] - 2024-10-30
-
+## [v0.13.0] - 2024-10-31
+
+- Fix buildvcs issues with test scripts
+- Bump golang version from 1.19.3 to 1.23
+- Bump golangci-lint version from 1.50.0 to 1.61.0
+- Bump helm-chart-releaser action from v1.4.1 to v1.6.0
+- Ran `go mod tidy`
+- Update test cases for new info labels
+- Remove info labels from K8sMeta spec
 - Custom labels for `sloth_slo_info{}` metric [#4](https://github.com/linode-obs/sloth/pull/4)
 - Bump Helm Chart version
+- disable buildvcs [#8](https://github.com/linode-obs/sloth/pull/8)
 
 ## [v0.12.0] - 2023-07-03
 

docker/dev/Dockerfile

@@ -1,8 +1,8 @@
-FROM golang:1.19.3
+FROM golang:1.23
 
 LABEL org.opencontainers.image.source https://github.com/slok/sloth
 
-ARG GOLANGCI_LINT_VERSION="1.50.0"
+ARG GOLANGCI_LINT_VERSION="1.61.0"
 ARG MOCKERY_VERSION="2.14.0"
 ARG GOMARKDOC_VERSION="0.4.1"
 ARG HELM_VERSION="3.10.0"

docker/prod/Dockerfile

@@ -1,7 +1,7 @@
-# Set also `ARCH` ARG here so we can use it on all the `FROM`s. 
+# Set also `ARCH` ARG here so we can use it on all the `FROM`s.
 ARG ARCH
 
-FROM golang:1.19.3-alpine as build-stage
+FROM golang:1.23-alpine as build-stage
 
 LABEL org.opencontainers.image.source https://github.com/slok/sloth
 
@@ -26,10 +26,10 @@ RUN ./scripts/build/bin/build-raw.sh
 
 # Although we are on an specific architecture (normally linux/amd64) our go binary has been built for
 # ${ARCH} specific architecture.
-# To make portable our building process we base our final image on that same architecture as the binary 
+# To make portable our building process we base our final image on that same architecture as the binary
 # to obtain a resulting ${ARCH} image independently where we are building this image.
 FROM gcr.io/distroless/static:nonroot-${ARCH}
 
 COPY --from=build-stage /src/bin/sloth /usr/local/bin/sloth
 
-ENTRYPOINT ["/usr/local/bin/sloth"]
+ENTRYPOINT ["/usr/local/bin/sloth"]

go.mod

@@ -1,6 +1,6 @@
 module github.com/slok/sloth
 
-go 1.19
+go 1.23
 
 require (
 	github.com/OpenSLO/oslo v0.2.2-0.20210629193748-b882029ce777

internal/k8sprometheus/kubernetes.go

@@ -173,6 +173,9 @@ var prometheusServiceLevelFakes = []runtime.Object{
 					Labels: map[string]string{
 						"slo01k1": "slo01v1",
 					},
+					InfoLabels: map[string]string{
+						"foo": "bar",
+					},
 					SLI: slothv1.SLI{Events: &slothv1.SLIEvents{
 						ErrorQuery: `sum(rate(http_request_duration_seconds_count{job="myservice",code=~"(5..|429)"}[{{.window}}]))`,
 						TotalQuery: `sum(rate(http_request_duration_seconds_count{job="myservice"}[{{.window}}]))`,

internal/k8sprometheus/model.go

@@ -15,7 +15,6 @@ type K8sMeta struct {
 	Namespace   string
 	Annotations map[string]string
 	Labels      map[string]string
-	InfoLabels  map[string]string
 }
 
 // SLOGroup is a Kubernetes SLO group. Is created based on a regular Prometheus

internal/k8sprometheus/model_test.go

@@ -44,6 +44,9 @@ func getGoodSLO(name string) prometheus.SLO {
 			"owner":    "myteam",
 			"category": "test",
 		},
+		InfoLabels: map[string]string{
+			"foo": "bar",
+		},
 		PageAlertMeta: prometheus.AlertMeta{
 			Disable: false,
 			Name:    "testAlert",

internal/k8sprometheus/spec_test.go

@@ -234,6 +234,8 @@ spec:
     - name: "slo1"
       labels:
         category: test
+      infoLabels:
+        foo: bar
       objective: 99.99999
       description: "This is a test."
       sli:
@@ -299,6 +301,9 @@ spec:
 							"owner":    "myteam",
 							"category": "test",
 						},
+						InfoLabels: map[string]string{
+							"foo": "bar",
+						},
 						PageAlertMeta: prometheus.AlertMeta{
 							Disable: false,
 							Name:    "testAlert",

internal/prometheus/recording_rules_test.go

@@ -527,6 +527,9 @@ func TestGenerateMetaRecordingRules(t *testing.T) {
 				Labels: map[string]string{
 					"kind": "test",
 				},
+				InfoLabels: map[string]string{
+					"foo": "bar",
+				},
 			},
 			alertGroup: getAlertGroup(),
 			expRules: []rulefmt.Rule{
@@ -608,6 +611,7 @@ slo:error_budget:ratio{sloth_id="test", sloth_service="test-svc", sloth_slo="tes
 						"sloth_mode":      "test",
 						"sloth_spec":      "test/v1",
 						"sloth_objective": "99.9",
+						"foo":             "bar",
 					},
 				},
 			},

scripts/check/unit-test.sh

@@ -3,5 +3,5 @@
 set -o errexit
 set -o nounset
 
-go test -race -coverprofile=.test_coverage.txt $(go list ./... | grep -v /test/integration )
-go tool cover -func=.test_coverage.txt | tail -n1 | awk '{print "Total test coverage: " $3}'
+go test -buildvcs=false -race -coverprofile=.test_coverage.txt $(go list ./... | grep -v /test/integration )
+go tool cover -func=.test_coverage.txt | tail -n1 | awk '{print "Total test coverage: " $3}'