From 41f4672f6779816df153a060ae1703db0fde233a Mon Sep 17 00:00:00 2001 From: Varac Date: Sun, 6 Oct 2024 11:30:00 +0200 Subject: [PATCH 1/2] Don't create Namespace from within chart It's against the Helm best practices to create a Namespace with a chart template. It particularly breaks installing it with FluxCD as a HelmRelease. See https://github.com/helm/helm/issues/5465#issuecomment-473942223 for the explanation. --- .../directpv-chart/templates/Namespace.yaml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 operator/helm-charts/directpv-chart/templates/Namespace.yaml diff --git a/operator/helm-charts/directpv-chart/templates/Namespace.yaml b/operator/helm-charts/directpv-chart/templates/Namespace.yaml deleted file mode 100644 index 32bcf0d6..00000000 --- a/operator/helm-charts/directpv-chart/templates/Namespace.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - creationTimestamp: null - finalizers: - - foregroundDeletion - labels: - application-name: directpv.min.io - application-type: CSIDriver - directpv.min.io/created-by: kubectl-directpv - directpv.min.io/version: v1beta1 - pod-security.kubernetes.io/enforce: privileged - name: directpv -spec: {} -status: {} - - From d5e9b56036f5202d961cf67c1ec5853d4d5ffdd1 Mon Sep 17 00:00:00 2001 From: Varac Date: Sun, 6 Oct 2024 11:40:25 +0200 Subject: [PATCH 2/2] Make replicaCount configurable, remove unused values --- .../directpv-chart/templates/Deployment.yaml | 2 +- .../helm-charts/directpv-chart/values.yaml | 80 +------------------ 2 files changed, 3 insertions(+), 79 deletions(-) diff --git a/operator/helm-charts/directpv-chart/templates/Deployment.yaml b/operator/helm-charts/directpv-chart/templates/Deployment.yaml index 8551c57a..c703b4b4 100644 --- a/operator/helm-charts/directpv-chart/templates/Deployment.yaml +++ b/operator/helm-charts/directpv-chart/templates/Deployment.yaml @@ -11,7 +11,7 @@ metadata: name: controller namespace: directpv spec: - replicas: 3 + replicas: {{ .Values.replicaCount }} selector: matchLabels: selector.directpv.min.io: controller-jwalg diff --git a/operator/helm-charts/directpv-chart/values.yaml b/operator/helm-charts/directpv-chart/values.yaml index 02bbb6dd..86a509ac 100644 --- a/operator/helm-charts/directpv-chart/values.yaml +++ b/operator/helm-charts/directpv-chart/values.yaml @@ -2,81 +2,5 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -replicaCount: 1 - -image: - repository: nginx - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: "" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - # Specifies whether a service account should be created - create: true - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -podAnnotations: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: false - className: "" - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -nodeSelector: {} - -tolerations: [] - -affinity: {} +# Controller replica count +replicaCount: 3