diff --git a/kustomize/bases/grafana/grafana-deployment.yaml b/kustomize/bases/grafana/grafana-deployment.yaml index 5d8bc5c..437f59d 100644 --- a/kustomize/bases/grafana/grafana-deployment.yaml +++ b/kustomize/bases/grafana/grafana-deployment.yaml @@ -16,14 +16,19 @@ spec: labels: app.kubernetes.io/name: grafana spec: + initContainers: + - name: init-ownership + image: bash:5 + command: ['chown', '-R', '472:472', '/var/lib/grafana'] + volumeMounts: + - mountPath: /var/lib/grafana + name: grafana-pv containers: - name: grafana image: grafana/grafana env: - name: GF_AUTH_ANONYMOUS_ENABLED - value: "true" - - name: GF_AUTH_ANONYMOUS_ORG_ROLE - value: Viewer + value: "false" # - name: GF_DATABASE_TYPE # value: postgres # - name: GF_DATABASE_HOST diff --git a/kustomize/bases/longhorn/kustomization.yaml b/kustomize/bases/longhorn/kustomization.yaml index b2a706b..b4e4bc3 100644 --- a/kustomize/bases/longhorn/kustomization.yaml +++ b/kustomize/bases/longhorn/kustomization.yaml @@ -1,3 +1,6 @@ resources: - https://raw.githubusercontent.com/longhorn/longhorn/v1.2.0/deploy/longhorn.yaml - - longhorn-ingress.yaml \ No newline at end of file + - longhorn-ingress.yaml + +patchesStrategicMerge: + - longhorn-configmap-patch.yaml diff --git a/kustomize/bases/longhorn/longhorn-configmap-patch.yaml b/kustomize/bases/longhorn/longhorn-configmap-patch.yaml new file mode 100644 index 0000000..dfc15da --- /dev/null +++ b/kustomize/bases/longhorn/longhorn-configmap-patch.yaml @@ -0,0 +1,70 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: longhorn-default-setting + namespace: longhorn-system +data: + default-setting.yaml: |- + backup-target: + backup-target-credential-secret: + allow-recurring-job-while-volume-detached: + create-default-disk-labeled-nodes: + default-data-path: + replica-soft-anti-affinity: + storage-over-provisioning-percentage: + storage-minimal-available-percentage: + upgrade-checker: + default-replica-count: 2 + default-data-locality: best-effort + guaranteed-engine-cpu: + default-longhorn-static-storage-class: + backupstore-poll-interval: + taint-toleration: + system-managed-components-node-selector: + priority-class: + auto-salvage: + auto-delete-pod-when-volume-detached-unexpectedly: + disable-scheduling-on-cordoned-node: + replica-zone-soft-anti-affinity: + volume-attachment-recovery-policy: + node-down-pod-deletion-policy: + allow-node-drain-with-last-healthy-replica: + mkfs-ext4-parameters: + disable-replica-rebuild: + replica-replenishment-wait-interval: + disable-revision-counter: + system-managed-pods-image-pull-policy: + allow-volume-creation-with-degraded-availability: + auto-cleanup-system-generated-snapshot: + concurrent-automatic-engine-upgrade-per-node-limit: + backing-image-cleanup-wait-interval: + guaranteed-engine-manager-cpu: + guaranteed-replica-manager-cpu: +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: longhorn-storageclass + namespace: longhorn-system +data: + storageclass.yaml: | + kind: StorageClass + apiVersion: storage.k8s.io/v1 + metadata: + name: longhorn + provisioner: driver.longhorn.io + allowVolumeExpansion: true + reclaimPolicy: Delete + volumeBindingMode: Immediate + parameters: + numberOfReplicas: "2" + staleReplicaTimeout: "2880" + fromBackup: "" + # backingImage: "bi-test" + # backingImageDataSourceType: "download" + # backingImageDataSourceParameters: '{"url": "https://backing-image-example.s3-region.amazonaws.com/test-backing-image"}' + # backingImageChecksum: "SHA512 checksum of the backing image" + # diskSelector: "ssd,fast" + # nodeSelector: "storage,fast" + # recurringJobSelector: '[{"name":"snap-group", "isGroup":true}, + # {"name":"backup", "isGroup":false}]' \ No newline at end of file diff --git a/kustomize/bases/prometheus/prometheus.yaml b/kustomize/bases/prometheus/prometheus.yaml index 69b8380..f7ffca9 100644 --- a/kustomize/bases/prometheus/prometheus.yaml +++ b/kustomize/bases/prometheus/prometheus.yaml @@ -12,7 +12,7 @@ spec: monitor: prometheus resources: requests: - cpu: 7500m + cpu: 750m memory: 2Gi limits: cpu: 1000m