scottk/cozystack
1
0
Fork 0
mirror of https://github.com/outbackdingo/cozystack.git synced 2026-03-21 20:41:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

aaaarrrrr

Browse Source 
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
This commit is contained in:
Andrei Kvapil
2024-02-02 18:29:54 +01:00
parent 241cf2aa4c
commit d88fa060c0
10 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/apps/kubernetes/templates/cluster.yaml
View File

@@ -1,7 +1,7 @@
{{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }}
{{- $etcd := index $myNS.metadata.labels "namespace.cozystack.io/etcd" }}
{{- $ingress := index $myNS.metadata.labels "namespace.cozystack.io/ingress" }}
{{- $host := index $myNS.metadata.labels "namespace.cozystack.io/host" }}
{{- $etcd := index $myNS.metadata.annotations "namespace.cozystack.io/etcd" }}
{{- $ingress := index $myNS.metadata.annotations "namespace.cozystack.io/ingress" }}
{{- $host := index $myNS.metadata.annotations "namespace.cozystack.io/host" }}
---
apiVersion: cluster.x-k8s.io/v1beta1
kind: Cluster

6
packages/apps/tenant/templates/monitoring.yaml
View File

@@ -23,10 +23,8 @@ spec:
interval: 1m0s
timeout: 5m0s
values:
{{- if ne .Release.Namespace "tenant-root" }}
host: grafana.example.org
{{- else }}
host: {{ .Release.Namespace }}.grafana.example.org
{{- with .Values.host }}
host: grafana.{{ . }}
{{- end }}
metricsStorages:
- name: shortterm

6
packages/core/installer/images/installer.json
View File

@@ -1,14 +1,14 @@
{
"containerimage.config.digest": "sha256:1d2e7b80621a2417357a81bb2f67d4506c1196288eadcf47e96c7e5c381e446d",
"containerimage.config.digest": "sha256:46a40d3c00ea1a0c3b30004d38b1b0b4c1b6e3e8ba40301d392af38f66ad5b23",
"containerimage.descriptor": {
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"digest": "sha256:127a851b8f5d934e69530cecc817a24c5e5d8dc42b3372126078cd5da9876c60",
"digest": "sha256:52fb7ab8b18ebaba6c117e0952d3f975dd3ff6ef585dad867e17a11a16731047",
"size": 2074,
"platform": {
"architecture": "amd64",
"os": "linux"
}
},
"containerimage.digest": "sha256:127a851b8f5d934e69530cecc817a24c5e5d8dc42b3372126078cd5da9876c60",
"containerimage.digest": "sha256:52fb7ab8b18ebaba6c117e0952d3f975dd3ff6ef585dad867e17a11a16731047",
"image.name": "ghcr.io/aenix-io/cozystack/installer:latest"
}

1
packages/core/platform/templates/apps.yaml
View File

@@ -10,7 +10,6 @@ kind: Namespace
metadata:
annotations:
helm.sh/resource-policy: keep
labels:
namespace.cozystack.io/etcd: tenant-root
namespace.cozystack.io/monitoring: tenant-root
namespace.cozystack.io/ingress: tenant-root

4
packages/extra/monitoring/templates/grafana/grafana.yaml
View File

@@ -1,6 +1,6 @@
{{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }}
{{- $ingress := index $myNS.metadata.labels "namespace.cozystack.io/ingress" }}
{{- $host := index $myNS.metadata.labels "namespace.cozystack.io/host" }}
{{- $ingress := index $myNS.metadata.annotations "namespace.cozystack.io/ingress" }}
{{- $host := index $myNS.metadata.annotations "namespace.cozystack.io/host" }}
---
apiVersion: grafana.integreatly.org/v1beta1
kind: Grafana

2
packages/extra/monitoring/templates/oncall/oncall-release.yaml
View File

@@ -1,6 +1,6 @@
{{- if .Values.oncall.enabled }}
{{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }}
{{- $host := index $myNS.metadata.labels "namespace.cozystack.io/host" }}
{{- $host := index $myNS.metadata.annotations "namespace.cozystack.io/host" }}
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:

2
packages/system/dashboard/charts/kubeapps/templates/kubeappsapis/deployment.yaml
View File

@@ -71,7 +71,7 @@ spec:
{{- end }}
containers:
- name: kubeappsapis
image: ghcr.io/aenix-io/cozystack/kubeapps-apis:latest@sha256:318d655e1d15d6ef2bfcaeb5d2cbec0c76896270ff312115e4aeee4144143d1e
image: ghcr.io/aenix-io/cozystack/kubeapps-apis:latest@sha256:adcd4fda6a1e9384576edf3b539ae629fe8ce0cd764544f35e045666b5f35c93
imagePullPolicy: {{ .Values.kubeappsapis.image.pullPolicy | quote }}
{{- if .Values.kubeappsapis.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.kubeappsapis.containerSecurityContext "enabled" | toYaml | nindent 12 }}

6
packages/system/dashboard/images/kubeapps-apis.json
View File

@@ -1,4 +1,4 @@
{
"containerimage.config.digest": "sha256:09c21f2dcac00bfe5b401725059f07df935068a0999572dd67df8d5f6dc93647",
"containerimage.digest": "sha256:f5184a08662bbe2b1a09cb1483509dd5c8b523ba5ac3883db4dc76d4d18ce934"
}
"containerimage.config.digest": "sha256:3d9f31dfa89204482aff36a87f2a6cb6b2279ac2e894ded905e4c4c57bc00715",
"containerimage.digest": "sha256:adcd4fda6a1e9384576edf3b539ae629fe8ce0cd764544f35e045666b5f35c93"
}

2
packages/system/dashboard/images/kubeapps-apis/Dockerfile
View File

@@ -10,8 +10,10 @@ WORKDIR /source
RUN wget -O- https://github.com/vmware-tanzu/kubeapps/archive/refs/tags/${VERSION}.tar.gz | tar xzf - --strip-components=1
COPY fix-flux.diff /patches/fix-flux.diff
COPY labels.diff /patches/labels.diff
COPY reconcile-strategy.diff /patches/reconcile-strategy.diff
RUN patch -p1 < /patches/fix-flux.diff
RUN patch -p1 < /patches/labels.diff
RUN patch -p1 < /patches/reconcile-strategy.diff
FROM bitnami/golang:1.21.1 as builder
WORKDIR /go/src/github.com/vmware-tanzu/kubeapps

12
packages/system/dashboard/images/kubeapps-apis/reconcile-strategy.diff Normal file
View File

@@ -0,0 +1,12 @@
diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release.go
index fe7ca772d..8111feb1c 100644
--- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release.go
+++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/release.go
@@ -521,6 +529,7 @@ func (s *Server) newFluxHelmRelease(chart *models.Chart, targetName types.Namesp
Kind: sourcev1.HelmRepositoryKind,
Namespace: chart.Repo.Namespace,
},
+ ReconcileStrategy: "Revision",
},
},
},