diff --git a/.drone.yml b/.drone.yml index 2cf4da0..efd305b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,7 +2,7 @@ kind: pipeline name: deploy steps: - name: kustomize build dashboard (prod + staging) - image: aaronriedel/kustomize-ci + image: git.ar21.de/aaron/kustomize-ci commands: - cd /deployment-repo - git clone https://git.ar21.de/yolokube/core-deployments.git . @@ -19,7 +19,7 @@ steps: event: - push - name: kustomize build dashboard (staging) - image: aaronriedel/kustomize-ci + image: git.ar21.de/aaron/kustomize-ci commands: - cd /deployment-repo - git clone https://git.ar21.de/yolokube/core-deployments.git . diff --git a/README.md b/README.md index a0f7200..117f413 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ Please find the Documentation in the [Wiki](https://git.ar21.de/yolokube/masterplan/wiki/Core-Deployments). +[![App Status](https://argo.services.yolokube.de/api/badge?name=cilium)](https://argo.services.yolokube.de/applications/cilium) Cilium + [![App Status](https://argo.services.yolokube.de/api/badge?name=dashboard)](https://argo.services.yolokube.de/applications/dashboard) Dashboard [![App Status](https://argo.services.yolokube.de/api/badge?name=dashboard-staging)](https://argo.services.yolokube.de/applications/dashboard-staging) Dashboard (staging) diff --git a/app-files/core-deployments.yaml b/app-files/core-deployments.yaml index fea2098..f3ac1fe 100644 --- a/app-files/core-deployments.yaml +++ b/app-files/core-deployments.yaml @@ -9,7 +9,7 @@ spec: sources: - repoURL: https://traefik.github.io/charts chart: traefik - targetRevision: 27.0.2 + targetRevision: 28.1.0 helm: releaseName: traefik valueFiles: @@ -63,7 +63,7 @@ spec: sources: - repoURL: https://charts.longhorn.io chart: longhorn - targetRevision: 1.6.1 # see Infos below, the CSI snapshotter needs to be updated too <-- version association can be found here: https://longhorn.io/docs/latest/snapshots-and-backups/csi-snapshot-support/enable-csi-snapshot-support/ + targetRevision: 1.6.2 # see Infos below, the CSI snapshotter needs to be updated too <-- version association can be found here: https://longhorn.io/docs/latest/snapshots-and-backups/csi-snapshot-support/enable-csi-snapshot-support/ helm: releaseName: longhorn valueFiles: @@ -75,10 +75,10 @@ spec: targetRevision: HEAD path: longhorn - repoURL: https://github.com/kubernetes-csi/external-snapshotter.git - targetRevision: v6.3.2 # <-- needs to be updated when longhorn version is changed. Find the correct version here: https://longhorn.io/docs/latest/snapshots-and-backups/csi-snapshot-support/csi-volume-snapshot-associated-with-longhorn-snapshot/ + targetRevision: v6.3.4 # <-- needs to be updated when longhorn version is changed. Find the correct version here: https://longhorn.io/docs/latest/snapshots-and-backups/csi-snapshot-support/csi-volume-snapshot-associated-with-longhorn-snapshot/ path: client/config/crd - repoURL: https://github.com/kubernetes-csi/external-snapshotter.git - targetRevision: v6.3.2 # <-- needs to be updated when longhorn version is changed. Find the correct version here: https://longhorn.io/docs/latest/snapshots-and-backups/csi-snapshot-support/csi-volume-snapshot-associated-with-longhorn-snapshot/ + targetRevision: v6.3.4 # <-- needs to be updated when longhorn version is changed. Find the correct version here: https://longhorn.io/docs/latest/snapshots-and-backups/csi-snapshot-support/csi-volume-snapshot-associated-with-longhorn-snapshot/ path: deploy/kubernetes/snapshot-controller destination: server: https://kubernetes.default.svc @@ -101,7 +101,7 @@ spec: sources: - chart: kube-prometheus-stack repoURL: https://prometheus-community.github.io/helm-charts - targetRevision: 58.0.1 + targetRevision: 58.7.2 helm: releaseName: prometheus valueFiles: @@ -126,6 +126,39 @@ spec: --- apiVersion: argoproj.io/v1alpha1 kind: Application +metadata: + name: cilium + namespace: argocd +spec: + project: default + sources: + - chart: cilium + repoURL: https://helm.cilium.io/ + targetRevision: 1.15.5 + helm: + releaseName: cilium-cni + valueFiles: + - $values/cilium/values.yaml + - repoURL: https://git.ar21.de/yolokube/core-deployments.git + targetRevision: HEAD + ref: values + - repoURL: https://git.ar21.de/yolokube/core-deployments.git + targetRevision: HEAD + path: cilium + destination: + server: https://kubernetes.default.svc + namespace: kube-cilium + syncPolicy: + syncOptions: + - CreateNamespace=true + - ServerSideApply=true + + automated: + selfHeal: false + prune: true +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application metadata: name: node-labeler namespace: argocd @@ -218,7 +251,7 @@ spec: sources: - chart: loki repoURL: https://grafana.github.io/helm-charts - targetRevision: 6.2.0 + targetRevision: 6.6.1 helm: releaseName: loki valueFiles: diff --git a/cilium/values.yaml b/cilium/values.yaml new file mode 100644 index 0000000..f110c6d --- /dev/null +++ b/cilium/values.yaml @@ -0,0 +1,37 @@ +encryption: + enabled: false +ipam: + mode: kubernetes + operator: + clusterPoolIPv4PodCIDRList: + - "10.1.0.0/16" + clusterPoolIPv6PodCIDRList: + - "fd01::/104" +ipv6: + enabled: true +ipv4: + enabled: true +prometheus: + enabled: true + serviceMonitor: + enabled: true +dashboards: + enabled: true +operator: + prometheus: + serviceMonitor: + enabled: true + dashboards: + enabled: true +hostPort: + enabled: true +envoy: + enabled: false + prometheus: + enabled: false +proxy: + prometheus: + enabled: false +tunnel: vxlan +enableIPv4Masquerade: true +enableIPv6Masquerade: true diff --git a/dashboard/overlays/prod/kustomization.yaml b/dashboard/overlays/prod/kustomization.yaml index d6df56c..e11653b 100644 --- a/dashboard/overlays/prod/kustomization.yaml +++ b/dashboard/overlays/prod/kustomization.yaml @@ -5,5 +5,5 @@ kind: Kustomization images: - name: git.ar21.de/yolokube/dashboard newName: git.ar21.de/yolokube/dashboard - newTag: "999" + newTag: "1110" namespace: dashboard diff --git a/dashboard/overlays/staging/kustomization.yaml b/dashboard/overlays/staging/kustomization.yaml index 6010717..5eb96e4 100644 --- a/dashboard/overlays/staging/kustomization.yaml +++ b/dashboard/overlays/staging/kustomization.yaml @@ -5,7 +5,7 @@ kind: Kustomization images: - name: git.ar21.de/yolokube/dashboard newName: git.ar21.de/yolokube/dashboard - newTag: staging-997 + newTag: staging-1107 namespace: dashboard-staging patches: - patch: |- diff --git a/dashboard/prod/dashboard.yaml b/dashboard/prod/dashboard.yaml index f8a9a90..06e5f17 100644 --- a/dashboard/prod/dashboard.yaml +++ b/dashboard/prod/dashboard.yaml @@ -34,7 +34,7 @@ spec: app: dashboard spec: containers: - - image: git.ar21.de/yolokube/dashboard:999 + - image: git.ar21.de/yolokube/dashboard:1110 imagePullPolicy: Always livenessProbe: httpGet: diff --git a/dashboard/staging/dashboard.yaml b/dashboard/staging/dashboard.yaml index 15e8de7..c011df9 100644 --- a/dashboard/staging/dashboard.yaml +++ b/dashboard/staging/dashboard.yaml @@ -34,7 +34,7 @@ spec: app: dashboard spec: containers: - - image: git.ar21.de/yolokube/dashboard:staging-997 + - image: git.ar21.de/yolokube/dashboard:staging-1107 imagePullPolicy: Always livenessProbe: httpGet: diff --git a/loki/values.yaml b/loki/values.yaml index eaa9a17..8c1e337 100644 --- a/loki/values.yaml +++ b/loki/values.yaml @@ -13,15 +13,11 @@ loki: configs: - from: 2024-04-14 store: tsdb - object_store: filesystem + object_store: s3 schema: v13 index: prefix: index_ period: 24h - storageConfig: - tsdb_shipper: - active_index_directory: /data/tsdb-index - cache_location: /data/tsdb-cache # compactor: # working_directory: /data/retention # compaction_interval: 10m