Merge branch 'main' into volumeMount

Author: anirudhprasad-sap

.github/workflows/build.yml

@@ -17,7 +17,7 @@ permissions:
 jobs:
   build:
     name: Build and Test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
 
     - name: Check out code into the Go module directory
@@ -47,7 +47,7 @@ jobs:
   analysis:
     name: Analyze with Sonar Cloud
     needs: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
 
     - name: Check out code for Sonar Analysis

.github/workflows/publish-docker.yaml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         workload: ["controller", "server", "web-hooks"]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
       packages: write

.github/workflows/publish-website.yaml

@@ -24,7 +24,7 @@ defaults:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -40,12 +40,12 @@ jobs:
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v3
         with:
-          hugo-version: "0.134.0"
+          hugo-version: "0.139.3"
           extended: true
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: "20.x"
+          node-version: "22.x"
       - name: Update dependencies
         run: |
           cd website
@@ -70,7 +70,7 @@ jobs:
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: build
 
     steps:

.github/workflows/publish.yaml

@@ -11,11 +11,11 @@ defaults:
 jobs:
   generate_crd:
     name: Generate CRD
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4     
+        uses: actions/checkout@v4
 
       - name: Generate and Upload CRD
         run: |

cmd/controller/main.go

@@ -28,7 +28,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	promop "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned"
-	apiext "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 )
 
 const (
@@ -55,11 +54,6 @@ func main() {
 		klog.Fatal("could not create client for custom resources: ", err.Error())
 	}
 
-	apiExtClient, err := apiext.NewForConfig(config)
-	if err != nil {
-		klog.Fatal("could not create client for api-extensions: ", err.Error())
-	}
-
 	promClient, err := promop.NewForConfig(config)
 	if err != nil {
 		klog.Fatal("could not create client for prometheus-operator resources: ", err.Error())
@@ -85,6 +79,9 @@ func main() {
 		klog.Fatal("could not create client for dns resources: ", err.Error())
 	}
 
+	// Initialize/start metrics server
+	util.InitMetricsServer()
+
 	// context for the reconciliation controller
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -120,7 +117,7 @@ func main() {
 		Callbacks: leaderelection.LeaderCallbacks{
 			OnStartedLeading: func(ctx context.Context) {
 				klog.InfoS("Started leading: ", LeaseLockName, leaseLockId)
-				c := controller.NewController(coreClient, crdClient, istioClient, certClient, certManagerClient, dnsClient, apiExtClient, promClient)
+				c := controller.NewController(coreClient, crdClient, istioClient, certClient, certManagerClient, dnsClient, promClient)
 				go c.Start(ctx)
 			},
 			OnStoppedLeading: func() {

cmd/server/server.go

@@ -21,7 +21,11 @@ import (
 func main() {
 	klog.SetLogger(util.GetLogger())
 	subHandler := getSubscriptionHandler()
-	http.HandleFunc("/provision/", subHandler.HandleRequest)
+
+	http.HandleFunc("/provision/", util.InstrumentHttpHandler(subHandler.HandleRequest, "cap_op_subscription_requests", "subscription-server requests."))
+
+	// Initialize/start metrics server
+	util.InitMetricsServer()
 
 	// Default port
 	port := "4000"

cmd/web-hooks/internal/handler/handler.go

@@ -20,7 +20,6 @@ import (
 	"github.com/sap/cap-operator/pkg/client/clientset/versioned"
 	"golang.org/x/exp/slices"
 	admissionv1 "k8s.io/api/admission/v1"
-	"k8s.io/api/admission/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -698,10 +697,10 @@ func getAdmissionRequestFromBytes(w http.ResponseWriter, body []byte) *admission
 
 func prepareResponse(w http.ResponseWriter, admissionReview *admissionv1.AdmissionReview, validation validateResource) []byte {
 	// prepare response object
-	finalizedAdmissionReview := v1beta1.AdmissionReview{}
+	finalizedAdmissionReview := admissionv1.AdmissionReview{}
 	finalizedAdmissionReview.Kind = admissionReview.Kind
 	finalizedAdmissionReview.APIVersion = admissionReview.APIVersion
-	finalizedAdmissionReview.Response = &v1beta1.AdmissionResponse{
+	finalizedAdmissionReview.Response = &admissionv1.AdmissionResponse{
 		UID:     admissionReview.Request.UID,
 		Allowed: validation.allowed,
 	}

crds/sme.sap.com_capapplications.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: capapplications.sme.sap.com
 spec:
   group: sme.sap.com

crds/sme.sap.com_capapplicationversions.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: capapplicationversions.sme.sap.com
 spec:
   group: sme.sap.com
@@ -1460,6 +1460,8 @@ spec:
                             runAsUser:
                               format: int64
                               type: integer
+                            seLinuxChangePolicy:
+                              type: string
                             seLinuxOptions:
                               properties:
                                 level:
@@ -1654,6 +1656,8 @@ spec:
                                 x-kubernetes-int-or-string: true
                               type: object
                           type: object
+                        restartPolicy:
+                          type: string
                         securityContext:
                           properties:
                             allowPrivilegeEscalation:
@@ -3839,6 +3843,8 @@ spec:
                             runAsUser:
                               format: int64
                               type: integer
+                            seLinuxChangePolicy:
+                              type: string
                             seLinuxOptions:
                               properties:
                                 level:
@@ -3927,6 +3933,8 @@ spec:
                                 x-kubernetes-int-or-string: true
                               type: object
                           type: object
+                        restartPolicy:
+                          type: string
                         securityContext:
                           properties:
                             allowPrivilegeEscalation:

crds/sme.sap.com_captenantoperations.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: captenantoperations.sme.sap.com
 spec:
   group: sme.sap.com