Skip to content

Commit

Permalink
Add new updates
Browse files Browse the repository at this point in the history
  • Loading branch information
marmila committed Dec 18, 2023
2 parents 3bacaae + 56b9676 commit 8c7e851
Show file tree
Hide file tree
Showing 20 changed files with 53 additions and 22 deletions.
8 changes: 7 additions & 1 deletion ansible/vars/picluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ minio_server_datadirs:
- /storage/minio

# Minio admin credentials
minio_root_user: "minioadmin"
minio_root_user: "root"
minio_root_password: "{{ vault.minio.root.key }}"

# Minio site region configuration
Expand Down Expand Up @@ -230,7 +230,13 @@ restic_environment:
# Vault configuration
#######################

<<<<<<< HEAD
vault_hostname: "vault.picluster.marmilan.com"
=======
vault_hostname: "vault.picluster.ricsanfre.com"
vault_version: 1.15.2

>>>>>>> upstream/master
vault_dns: "{{ vault_hostname }}"
vault_version: 1.15.2
vault_enable_tls: true
Expand Down
4 changes: 4 additions & 0 deletions argocd/bootstrap/argocd/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,9 @@ name: argocd
version: 0.0.0
dependencies:
- name: argo-cd
<<<<<<< HEAD
version: 5.51.2
=======
version: 5.51.4
>>>>>>> upstream/master
repository: https://argoproj.github.io/argo-helm
2 changes: 1 addition & 1 deletion argocd/bootstrap/crds/cert-manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ resources:
# Cert-manager helm installation https://cert-manager.io/docs/installation/helm/
# CDRs can be installed manually.
# cert-manager helm chart to be installed with value installCDRs=false
- https://github.com/cert-manager/cert-manager/releases/download/v1.13.1/cert-manager.crds.yaml
- https://github.com/cert-manager/cert-manager/releases/download/v1.13.2/cert-manager.crds.yaml
4 changes: 4 additions & 0 deletions argocd/bootstrap/crds/external-secrets/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@ resources:
# external-secrets https://github.com/external-secrets/external-secrets/tree/main/deploy/charts/external-secrets
# helm chart version 0.9.9
# external-secrets helm chart to be installed with value installCDRs=false
<<<<<<< HEAD
- https://raw.githubusercontent.com/external-secrets/external-secrets/v0.9.9/deploy/crds/bundle.yaml
=======
- https://raw.githubusercontent.com/external-secrets/external-secrets/v0.9.9/deploy/crds/bundle.yaml
>>>>>>> upstream/master
4 changes: 4 additions & 0 deletions argocd/system/external-secrets/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@ version: 0.0.0
dependencies:
- name: external-secrets
version: 0.9.9
<<<<<<< HEAD
repository: https://charts.external-secrets.io
=======
repository: https://charts.external-secrets.io
>>>>>>> upstream/master
4 changes: 2 additions & 2 deletions argocd/system/kafka/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: kafka
version: 0.0.0
dependencies:
- name: strimzi-kafka-operator
version: 0.37.0
version: 0.38.0
repository: https://strimzi.io/charts/
- name: schema-registry
version: 15.0.0
version: 16.2.3
repository: oci://registry-1.docker.io/bitnamicharts
- name: kafdrop
version: 0.1.0
Expand Down
4 changes: 2 additions & 2 deletions argocd/system/kafka/templates/kafka-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ spec:
type: persistent-claim
class: {{ .Values.kafka_storage_class }}
size: {{ .Values.kafka_storage_size }}
deleteClaim: false
deleteClaim: true

zookeeper:
replicas: {{ .Values.kafka_zookeeper_replicas }}
storage:
type: persistent-claim
size: {{ .Values.kafka_zookeeper_storage_size }}
deleteClaim: false
deleteClaim: true
class: {{ .Values.kafka_zookeeper_storage_class }}
entityOperator:
topicOperator: {}
Expand Down
2 changes: 1 addition & 1 deletion argocd/system/linkerd-jaeger/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ name: linkerd-jaeger
version: 0.0.0
dependencies:
- name: linkerd-jaeger
version: 30.12.2
version: 30.12.6
repository: https://helm.linkerd.io/stable
2 changes: 1 addition & 1 deletion argocd/system/linkerd-viz/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ name: linkerd-viz
version: 0.0.0
dependencies:
- name: linkerd-viz
version: 30.12.2
version: 30.12.6
repository: https://helm.linkerd.io/stable
2 changes: 1 addition & 1 deletion argocd/system/linkerd/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ dependencies:
version: 1.8.0
repository: https://helm.linkerd.io/stable
- name: linkerd-control-plane
version: 1.16.2
version: 1.16.6
repository: https://helm.linkerd.io/stable
8 changes: 6 additions & 2 deletions argocd/system/logging/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@ dependencies:
version: 2.10.0
repository: https://helm.elastic.co
- name: fluentd
version: 0.4.4
version: 0.5.0
repository: https://fluent.github.io/helm-charts
- name: fluent-bit
version: 0.39.0
version: 0.40.0
repository: https://fluent.github.io/helm-charts
- name: loki
<<<<<<< HEAD
version: 5.36.3
=======
version: 5.38.0
>>>>>>> upstream/master
repository: https://grafana.github.io/helm-charts
- name: prometheus-elasticsearch-exporter
version: 5.3.1
Expand Down
4 changes: 4 additions & 0 deletions argocd/system/longhorn-system/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@ version: 0.0.0
dependencies:
- name: longhorn
version: 1.5.3
<<<<<<< HEAD
repository: https://charts.longhorn.io
=======
repository: https://charts.longhorn.io
>>>>>>> upstream/master
2 changes: 1 addition & 1 deletion argocd/system/metallb/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ name: metallb
version: 0.0.0
dependencies:
- name: metallb
version: 0.13.11
version: 0.13.12
repository: https://metallb.github.io/metallb
5 changes: 5 additions & 0 deletions argocd/system/monitoring/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,10 @@ name: monitoring
version: 0.0.0
dependencies:
- name: kube-prometheus-stack
<<<<<<< HEAD
version: 51.6.1
repository: https://prometheus-community.github.io/helm-charts
=======
version: 51.10.0
repository: https://prometheus-community.github.io/helm-charts
>>>>>>> upstream/master
2 changes: 1 addition & 1 deletion argocd/system/tracing/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ name: tracing
version: 0.0.0
dependencies:
- name: tempo-distributed
version: 1.6.10
version: 1.7.1
repository: https://grafana.github.io/helm-charts
2 changes: 1 addition & 1 deletion argocd/system/velero/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ name: velero
version: 0.0.0
dependencies:
- name: velero
version: 5.1.0
version: 5.1.4
repository: https://vmware-tanzu.github.io/helm-charts
4 changes: 2 additions & 2 deletions argocd/system/velero/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ velero:
# AWS backend and CSI plugins configuration
initContainers:
- name: velero-plugin-for-aws
image: velero/velero-plugin-for-aws:v1.8.0
image: velero/velero-plugin-for-aws:v1.8.2
imagePullPolicy: IfNotPresent
volumeMounts:
- mountPath: /target
name: plugins
- name: velero-plugin-for-csi
image: velero/velero-plugin-for-csi:v0.6.0
image: velero/velero-plugin-for-csi:v0.6.2
imagePullPolicy: IfNotPresent
volumeMounts:
- mountPath: /target
Expand Down
2 changes: 1 addition & 1 deletion docs/_docs/ansible-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ Automate backup tasks at OS level with restic in all nodes (`node1-node5` and `g
```shell
make configure-os-backup
```
Minio S3 server running in `node1` will be used as backup backend.
Minio S3 server VM, `s3`, hosted in Public Cloud (Oracle Cloud Infrastructure), will be used as backup backend.

{{site.data.alerts.note}}

Expand Down
8 changes: 4 additions & 4 deletions docs/_docs/backup.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: Backup & Restore
permalink: /docs/backup/
description: How to deploy a backup solution based on Velero and Restic in our Raspberry Pi Kubernetes Cluster.
last_modified_at: "13-10-2023"
last_modified_at: "05-12-2023"
---

## Backup Architecture and Design
Expand Down Expand Up @@ -38,11 +38,11 @@ The backup architecture is the following:
2) Filesystem level backup
3) Application unfreeze.

Longhorn provides its own mechanisms for doing the backups and to take snapshots of the persistent volumes. See Longhorn [documentation](https://longhorn.io/docs/1.3.1/snapshots-and-backups/).
Longhorn provides its own mechanisms for doing the backups and to take snapshots of the persistent volumes. See Longhorn [documentation](https://longhorn.io/docs/latest/snapshots-and-backups/).

Longhorn does not currently support application consistent volumes snapshots/backups, see [longhorn open issue #2128](https://github.com/longhorn/longhorn/issues/2128).

Longhorn does support, from release 1.2.4, [Kubernetes CSI snapshot API](https://kubernetes.io/docs/concepts/storage/volume-snapshots/) to take snapshots/backups programmatically. See Longhorn documentation: [CSI Snapshot Support](https://longhorn.io/docs/1.3.1/snapshots-and-backups/csi-snapshot-support/).
Longhorn does support, from release 1.2.4, [Kubernetes CSI snapshot API](https://kubernetes.io/docs/concepts/storage/volume-snapshots/) to take snapshots/backups programmatically. See Longhorn documentation: [CSI Snapshot Support](https://longhorn.io/docs/latest/snapshots-and-backups/csi-snapshot-support/).

Wiht this functionality application-consistent backups can be orchestrated:

Expand Down Expand Up @@ -901,7 +901,7 @@ spec:
hooks: {}
includedNamespaces:
- '*'
included_resources:
includedResources:
- '*'
includeClusterResources: true
metadata:
Expand Down
2 changes: 1 addition & 1 deletion docs/_includes/giscus.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
data-category="{{ site.giscus.category }}"
data-category-id="{{ site.giscus.category_id }}"
data-mapping="pathname"
data-strict="0"
data-strict="1"
data-reactions-enabled="1"
data-emit-metadata="0"
data-input-position="bottom"
Expand Down

0 comments on commit 8c7e851

Please sign in to comment.