Bump go version (#591)

---------

Co-authored-by: i065450 <naama.solomon@sap.com>

Author: kerenlahav

.github/workflows/go.yml

@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.25.3
+    - name: Set up Go 1.25.5
       uses: actions/setup-go@v2
       with:
-        go-version: 1.25.3
+        go-version: 1.25.5
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.25.3-alpine3.22 as builder
+FROM --platform=$BUILDPLATFORM golang:1.25.5-alpine3.23 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -21,7 +21,7 @@ ARG TARGETOS TARGETARCH
 RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH GO111MODULE=on go build -a -o manager main.go
 
 
-FROM alpine:3.22.2
+FROM alpine:3.23
 
 WORKDIR /
 COPY --from=builder /workspace/manager .

client/sm/client.go

@@ -40,6 +40,8 @@ const (
 	originatingIdentityHeader = "X-Originating-Identity"
 )
 
+var AppVersion string
+
 // Client should be implemented by SM clients
 //
 //go:generate counterfeiter . Client
@@ -446,6 +448,8 @@ func (client *serviceManagerClient) callWithUser(method string, smpath string, b
 		return nil, err
 	}
 	req.Header.Add("Content-Type", "application/json")
+	req.Header.Add("client-name", "sap-btp-service-operator")
+	req.Header.Add("client-version", AppVersion)
 	if len(user) > 0 {
 		req.Header.Add(originatingIdentityHeader, user)
 	}

go.mod

@@ -1,6 +1,6 @@
 module github.com/SAP/sap-btp-service-operator
 
-go 1.25.3
+go 1.25.5
 
 require (
 	github.com/Masterminds/sprig/v3 v3.3.0
@@ -69,7 +69,7 @@ require (
 	golang.org/x/text v0.31.0 // indirect
 	golang.org/x/time v0.9.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/protobuf v1.36.6 // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect

go.sum

@@ -234,6 +234,8 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
 google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
+google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

internal/utils/condition_utils.go

@@ -270,7 +270,7 @@ func getReadyCondition(object common.SAPBTPResource) metav1.Condition {
 		reason = common.Provisioned
 	}
 
-	return metav1.Condition{Type: common.ConditionReady, Status: status, Reason: reason}
+	return metav1.Condition{Type: common.ConditionReady, Status: status, Reason: reason, ObservedGeneration: object.GetGeneration()}
 }
 
 func getLastObservedGen(object common.SAPBTPResource) int64 {

main.go

@@ -22,6 +22,7 @@ import (
 	"os"
 	"time"
 
+	"github.com/SAP/sap-btp-service-operator/client/sm"
 	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	"k8s.io/apimachinery/pkg/labels"
@@ -84,6 +85,9 @@ func main() {
 
 	ctrl.SetLogger(zap.New(zap.UseDevMode(loggerUseDevMode)))
 
+	sm.AppVersion = os.Getenv("APP_VERSION")
+	setupLog.Info("starting btp-service-operator", "version", sm.AppVersion)
+
 	mgrOptions := ctrl.Options{
 		Scheme: scheme,
 		Metrics: server.Options{

sapbtp-operator-charts/templates/custom-ca-secret.yml

@@ -9,7 +9,9 @@ metadata:
 type: Opaque
 data:
   ca-certificates.crt: |
+{{- $certs := list }}
 {{- range .Values.manager.customCACerts }}
-{{ . | nindent 4 }}
+{{- $certs = append $certs (b64dec .) }}
 {{- end }}
+{{- $certs | join "\n" | b64enc | nindent 4 }}
 {{- end }}

sapbtp-operator-charts/templates/deployment.yml

@@ -84,6 +84,9 @@ spec:
             - --logger_use_dev_mode={{.Values.manager.logger_use_dev_mode}}
           command:
             - /manager
+          env:
+            - name: APP_VERSION
+              value: "{{ .Chart.AppVersion }}"
           envFrom:
             - configMapRef:
                 name: sap-btp-operator-config