From d88fa060c0e78d92a3022bc58a00a6686db82dda Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Fri, 2 Feb 2024 18:29:54 +0100 Subject: [PATCH] aaaarrrrr Signed-off-by: Andrei Kvapil --- packages/apps/kubernetes/templates/cluster.yaml | 6 +++--- packages/apps/tenant/templates/monitoring.yaml | 6 ++---- packages/core/installer/images/installer.json | 6 +++--- packages/core/platform/templates/apps.yaml | 1 - .../extra/monitoring/templates/grafana/grafana.yaml | 4 ++-- .../monitoring/templates/oncall/oncall-release.yaml | 2 +- .../kubeapps/templates/kubeappsapis/deployment.yaml | 2 +- packages/system/dashboard/images/kubeapps-apis.json | 6 +++--- .../system/dashboard/images/kubeapps-apis/Dockerfile | 2 ++ .../images/kubeapps-apis/reconcile-strategy.diff | 12 ++++++++++++ 10 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 packages/system/dashboard/images/kubeapps-apis/reconcile-strategy.diff diff --git a/packages/apps/kubernetes/templates/cluster.yaml b/packages/apps/kubernetes/templates/cluster.yaml index 77043b12..8f53724a 100644 --- a/packages/apps/kubernetes/templates/cluster.yaml +++ b/packages/apps/kubernetes/templates/cluster.yaml @@ -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 diff --git a/packages/apps/tenant/templates/monitoring.yaml b/packages/apps/tenant/templates/monitoring.yaml index 0a1d7a48..d0db03b5 100644 --- a/packages/apps/tenant/templates/monitoring.yaml +++ b/packages/apps/tenant/templates/monitoring.yaml @@ -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 diff --git a/packages/core/installer/images/installer.json b/packages/core/installer/images/installer.json index bf509c25..9d5d0a87 100644 --- a/packages/core/installer/images/installer.json +++ b/packages/core/installer/images/installer.json @@ -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" } \ No newline at end of file diff --git a/packages/core/platform/templates/apps.yaml b/packages/core/platform/templates/apps.yaml index cb1b01f9..1eea54da 100644 --- a/packages/core/platform/templates/apps.yaml +++ b/packages/core/platform/templates/apps.yaml @@ -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 diff --git a/packages/extra/monitoring/templates/grafana/grafana.yaml b/packages/extra/monitoring/templates/grafana/grafana.yaml index d19d5510..68402130 100644 --- a/packages/extra/monitoring/templates/grafana/grafana.yaml +++ b/packages/extra/monitoring/templates/grafana/grafana.yaml @@ -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 diff --git a/packages/extra/monitoring/templates/oncall/oncall-release.yaml b/packages/extra/monitoring/templates/oncall/oncall-release.yaml index 59132b12..46e51849 100644 --- a/packages/extra/monitoring/templates/oncall/oncall-release.yaml +++ b/packages/extra/monitoring/templates/oncall/oncall-release.yaml @@ -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: diff --git a/packages/system/dashboard/charts/kubeapps/templates/kubeappsapis/deployment.yaml b/packages/system/dashboard/charts/kubeapps/templates/kubeappsapis/deployment.yaml index c6b66bd1..9340d1e3 100644 --- a/packages/system/dashboard/charts/kubeapps/templates/kubeappsapis/deployment.yaml +++ b/packages/system/dashboard/charts/kubeapps/templates/kubeappsapis/deployment.yaml @@ -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 }} diff --git a/packages/system/dashboard/images/kubeapps-apis.json b/packages/system/dashboard/images/kubeapps-apis.json index ad2ee9d6..fb011c37 100644 --- a/packages/system/dashboard/images/kubeapps-apis.json +++ b/packages/system/dashboard/images/kubeapps-apis.json @@ -1,4 +1,4 @@ { - "containerimage.config.digest": "sha256:09c21f2dcac00bfe5b401725059f07df935068a0999572dd67df8d5f6dc93647", - "containerimage.digest": "sha256:f5184a08662bbe2b1a09cb1483509dd5c8b523ba5ac3883db4dc76d4d18ce934" -} + "containerimage.config.digest": "sha256:3d9f31dfa89204482aff36a87f2a6cb6b2279ac2e894ded905e4c4c57bc00715", + "containerimage.digest": "sha256:adcd4fda6a1e9384576edf3b539ae629fe8ce0cd764544f35e045666b5f35c93" +} \ No newline at end of file diff --git a/packages/system/dashboard/images/kubeapps-apis/Dockerfile b/packages/system/dashboard/images/kubeapps-apis/Dockerfile index 456a59ee..fdc110ea 100644 --- a/packages/system/dashboard/images/kubeapps-apis/Dockerfile +++ b/packages/system/dashboard/images/kubeapps-apis/Dockerfile @@ -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 diff --git a/packages/system/dashboard/images/kubeapps-apis/reconcile-strategy.diff b/packages/system/dashboard/images/kubeapps-apis/reconcile-strategy.diff new file mode 100644 index 00000000..fc1cc233 --- /dev/null +++ b/packages/system/dashboard/images/kubeapps-apis/reconcile-strategy.diff @@ -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", + }, + }, + },