Add support of ephemeral-storage resource definition for opentelemetr…

…y-operator (open-telemetry#1170) * Allowed ephemeral storage to operator * Resolve chart version conflicts * Bump version * Added key and comments * Revert changes in crd * fix spaces * Disable ephemeral-storage by default
swiatekm · May 16, 2024 · f32c273 · f32c273
1 parent aaa70bd
commit f32c273
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 20 deletions.
diff --git a/charts/opentelemetry-operator/Chart.yaml b/charts/opentelemetry-operator/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-operator
-version: 0.58.0
+version: 0.58.1
 description: OpenTelemetry Operator Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/

diff --git a/...ator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml b/...ator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.0
+    helm.sh/chart: opentelemetry-operator-0.58.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm
@@ -91,7 +91,7 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.0
+    helm.sh/chart: opentelemetry-operator-0.58.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml b/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml
@@ -4,7 +4,7 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.0
+    helm.sh/chart: opentelemetry-operator-0.58.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm
@@ -30,7 +30,7 @@ apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.0
+    helm.sh/chart: opentelemetry-operator-0.58.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml b/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.0
+    helm.sh/chart: opentelemetry-operator-0.58.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm
@@ -223,7 +223,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.0
+    helm.sh/chart: opentelemetry-operator-0.58.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm
@@ -242,7 +242,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.0
+    helm.sh/chart: opentelemetry-operator-0.58.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml b/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.0
+    helm.sh/chart: opentelemetry-operator-0.58.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm
@@ -26,7 +26,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.0
+    helm.sh/chart: opentelemetry-operator-0.58.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml b/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml
@@ -4,7 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.0
+    helm.sh/chart: opentelemetry-operator-0.58.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/role.yaml b/charts/opentelemetry-operator/examples/default/rendered/role.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.0
+    helm.sh/chart: opentelemetry-operator-0.58.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml b/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.0
+    helm.sh/chart: opentelemetry-operator-0.58.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/service.yaml b/charts/opentelemetry-operator/examples/default/rendered/service.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.0
+    helm.sh/chart: opentelemetry-operator-0.58.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm
@@ -32,7 +32,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.0
+    helm.sh/chart: opentelemetry-operator-0.58.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml b/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml
@@ -6,7 +6,7 @@ metadata:
   name: opentelemetry-operator
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.0
+    helm.sh/chart: opentelemetry-operator-0.58.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/...s/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml b/...s/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml
@@ -6,7 +6,7 @@ metadata:
   name: "example-opentelemetry-operator-cert-manager"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.0
+    helm.sh/chart: opentelemetry-operator-0.58.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml b/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml
@@ -6,7 +6,7 @@ metadata:
   name: "example-opentelemetry-operator-metrics"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.0
+    helm.sh/chart: opentelemetry-operator-0.58.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm
@@ -44,7 +44,7 @@ metadata:
   name: "example-opentelemetry-operator-webhook"
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-operator-0.58.0
+    helm.sh/chart: opentelemetry-operator-0.58.1
     app.kubernetes.io/name: opentelemetry-operator
     app.kubernetes.io/version: "0.99.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/charts/opentelemetry-operator/values.schema.json b/charts/opentelemetry-operator/values.schema.json
@@ -555,6 +555,14 @@
                                     "examples": [
                                         "128Mi"
                                     ]
+                                },
+                                "ephemeral-storage": {
+                                    "type": "string",
+                                    "default": "",
+                                    "title": "The ephemeral-storage Schema",
+                                    "examples": [
+                                        "50Mi"
+                                    ]
                                 }
                             },
                             "examples": [{
@@ -587,6 +595,14 @@
                                     "examples": [
                                         "64Mi"
                                     ]
+                                },
+                                "ephemeral-storage": {
+                                    "type": "string",
+                                    "default": "",
+                                    "title": "The ephemeral-storage Schema",
+                                    "examples": [
+                                        "50Mi"
+                                    ]
                                 }
                             },
                             "examples": [{

diff --git a/charts/opentelemetry-operator/values.yaml b/charts/opentelemetry-operator/values.yaml
@@ -80,9 +80,11 @@ manager:
     limits:
       cpu: 100m
       memory: 128Mi
+      # ephemeral-storage: 50Mi
     requests:
       cpu: 100m
       memory: 64Mi
+      # ephemeral-storage: 50Mi
   ## Adds additional environment variables
   ## e.g ENV_VAR: env_value
   env:
@@ -138,17 +140,19 @@ manager:
   # Enable vertical pod autoscaler support for the manager
   verticalPodAutoscaler:
     enabled: false
-    # List of resources that the vertical pod autoscaler can control. Defaults to cpu and memory
+    # List of resources that the vertical pod autoscaler can control. Defaults to cpu, memory and ephemeral-storage.
     controlledResources: []
 
     # Define the max allowed resources for the pod
     maxAllowed: {}
     # cpu: 200m
     # memory: 100Mi
+    # ephemeral-storage: 50Mi
     # Define the min allowed resources for the pod
     minAllowed: {}
     # cpu: 200m
     # memory: 100Mi
+    # ephemeral-storage: 50Mi
 
     updatePolicy:
       # Specifies whether recommended updates are applied when a Pod is started and whether recommended updates