diff --git a/.drone.yml b/.drone.yml index efd305b..2cf4da0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,7 +2,7 @@ kind: pipeline name: deploy steps: - name: kustomize build dashboard (prod + staging) - image: git.ar21.de/aaron/kustomize-ci + image: aaronriedel/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: git.ar21.de/aaron/kustomize-ci + image: aaronriedel/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 117f413..a0f7200 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ 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 a6720b0..a75777e 100644 --- a/app-files/core-deployments.yaml +++ b/app-files/core-deployments.yaml @@ -101,7 +101,7 @@ spec: sources: - chart: kube-prometheus-stack repoURL: https://prometheus-community.github.io/helm-charts - targetRevision: 58.7.2 + targetRevision: 58.0.1 helm: releaseName: prometheus valueFiles: @@ -126,39 +126,6 @@ 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 @@ -251,7 +218,7 @@ spec: sources: - chart: loki repoURL: https://grafana.github.io/helm-charts - targetRevision: 6.6.1 + targetRevision: 6.5.2 helm: releaseName: loki valueFiles: diff --git a/cilium/values.yaml b/cilium/values.yaml deleted file mode 100644 index f110c6d..0000000 --- a/cilium/values.yaml +++ /dev/null @@ -1,37 +0,0 @@ -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 e11653b..181ab57 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: "1110" + newTag: "1109" namespace: dashboard diff --git a/dashboard/prod/dashboard.yaml b/dashboard/prod/dashboard.yaml index 06e5f17..564837c 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:1110 + - image: git.ar21.de/yolokube/dashboard:1109 imagePullPolicy: Always livenessProbe: httpGet: