Merge pull request #62 from SAP/new-metric-project-creation-time

dafe-corporate-sap · web-flow · commit 7a6d5ca3b5da · 2024-05-31T16:47:17.000+02:00
introducing project creation time metric
diff --git a/Makefile b/Makefile
@@ -138,7 +138,7 @@ LISTER_GEN ?= $(shell pwd)/bin/lister-gen
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v3.8.7
-CONTROLLER_TOOLS_VERSION ?= v0.9.2
+CONTROLLER_TOOLS_VERSION ?= v0.14.0
 CODE_GENERATOR_VERSION ?= v0.23.4
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/core.cs.sap.com_projects.yaml b/config/crd/bases/core.cs.sap.com_projects.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: projects.core.cs.sap.com
 spec:
   group: core.cs.sap.com
@@ -28,14 +27,19 @@ spec:
         description: Project is the Schema for the projects API.
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -2,7 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: manager-role
 rules:
 - apiGroups:
diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml
@@ -2,7 +2,6 @@
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
-  creationTimestamp: null
   name: validating-webhook-configuration
 webhooks:
 - admissionReviewVersions:
diff --git a/controllers/project_controller.go b/controllers/project_controller.go
@@ -116,10 +116,12 @@ func (r *ProjectReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re
 				metrics.ProjectTTLSecondsRemaining.WithLabelValues(project.Name).Set(0)
 				metrics.ProjectExpired.WithLabelValues(project.Name).Set(0)
 			}
+			metrics.ProjectCreationTime.WithLabelValues(project.Name).Set(float64(project.CreationTimestamp.Unix()))
 		} else {
 			metrics.ProjectReconcileErrors.DeleteLabelValues(project.Name)
 			metrics.ProjectTTLSecondsInitial.DeleteLabelValues(project.Name)
 			metrics.ProjectTTLSecondsRemaining.DeleteLabelValues(project.Name)
+			metrics.ProjectCreationTime.DeleteLabelValues(project.Name)
 			metrics.ProjectExpired.DeleteLabelValues(project.Name)
 		}
 		if skipStatusUpdate {
diff --git a/crds/core.cs.sap.com_projects.yaml b/crds/core.cs.sap.com_projects.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: projects.core.cs.sap.com
 spec:
   group: core.cs.sap.com
@@ -28,14 +27,19 @@ spec:
         description: Project is the Schema for the projects API.
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object
diff --git a/internal/metrics/project_metrics.go b/internal/metrics/project_metrics.go
@@ -33,6 +33,13 @@ var (
 		},
 		[]string{"project"},
 	)
+	ProjectCreationTime = prometheus.NewGaugeVec(
+		prometheus.GaugeOpts{
+			Name: "project_creation_time",
+			Help: "Creation time of the project in epoch seconds. Zero means that the project has not been created yet.",
+		},
+		[]string{"project"},
+	)
 	ProjectExpired = prometheus.NewGaugeVec(
 		prometheus.GaugeOpts{
 			Name: "project_expired",
@@ -47,6 +54,7 @@ func init() {
 		ProjectReconcileErrors,
 		ProjectTTLSecondsInitial,
 		ProjectTTLSecondsRemaining,
+		ProjectCreationTime,
 		ProjectExpired,
 	)
 }

Original file line number	Diff line number	Diff line change
`@@ -116,10 +116,12 @@ func (r *ProjectReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re`
`116`	`116`	`metrics.ProjectTTLSecondsRemaining.WithLabelValues(project.Name).Set(0)`
`117`	`117`	`metrics.ProjectExpired.WithLabelValues(project.Name).Set(0)`
`118`	`118`	`}`
	`119`	`+ metrics.ProjectCreationTime.WithLabelValues(project.Name).Set(float64(project.CreationTimestamp.Unix()))`
`119`	`120`	`} else {`
`120`	`121`	`metrics.ProjectReconcileErrors.DeleteLabelValues(project.Name)`
`121`	`122`	`metrics.ProjectTTLSecondsInitial.DeleteLabelValues(project.Name)`
`122`	`123`	`metrics.ProjectTTLSecondsRemaining.DeleteLabelValues(project.Name)`
	`124`	`+ metrics.ProjectCreationTime.DeleteLabelValues(project.Name)`
`123`	`125`	`metrics.ProjectExpired.DeleteLabelValues(project.Name)`
`124`	`126`	`}`
`125`	`127`	`if skipStatusUpdate {`