Skip to content

Commit 9a20151

Browse files
committed
Update kubeapps v2.12.0
Signed-off-by: Andrei Kvapil <[email protected]>
1 parent e44bece commit 9a20151

9 files changed

Lines changed: 359 additions & 103 deletions

File tree

‎packages/core/platform/bundles/paas-full.yaml‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -210,25 +210,28 @@ releases:
210210
chart: cozy-dashboard
211211
namespace: cozy-dashboard
212212
dependsOn: [cilium,kubeovn,keycloak-configure]
213-
{{- if .Capabilities.APIVersions.Has "source.toolkit.fluxcd.io/v1" }}
214-
{{- with (lookup "source.toolkit.fluxcd.io/v1" "HelmRepository" "cozy-public" "").items }}
215213
values:
216-
redis:
217-
master:
218-
podAnnotations:
219-
{{- range $index, $repo := . }}
220-
{{- with (($repo.status).artifact).revision }}
221-
repository.cozystack.io/{{ $repo.metadata.name }}: {{ quote . }}
222-
{{- end }}
223-
{{- end }}
224-
{{- end }}
225-
{{- end }}
214+
{{- if .Capabilities.APIVersions.Has "source.toolkit.fluxcd.io/v1" }}
215+
{{- with (lookup "source.toolkit.fluxcd.io/v1" "HelmRepository" "cozy-public" "").items }}
216+
redis:
217+
master:
218+
podAnnotations:
219+
{{- range $index, $repo := . }}
220+
{{- with (($repo.status).artifact).revision }}
221+
repository.cozystack.io/{{ $repo.metadata.name }}: {{ quote . }}
222+
{{- end }}
223+
{{- end }}
224+
{{- end }}
225+
{{- end }}
226+
227+
{{- $dashboardKCconfig := lookup "v1" "ConfigMap" "cozy-dashboard" "kubeapps-auth-config" }}
228+
{{- $dashboardKCValues := dig "data" "values.yaml" "" $dashboardKCconfig }}
229+
{{- if $dashboardKCValues }}
230+
{{- $dashboardKCValues | nindent 4 }}
231+
{{- end }}
232+
226233
{{- if eq $oidcEnabled "true" }}
227234
dependsOn: [keycloak-configure]
228-
valuesFrom:
229-
- kind: ConfigMap
230-
name: kubeapps-auth-config
231-
valuesKey: values.yaml
232235
{{- else }}
233236
dependsOn: []
234237
{{- end }}

‎packages/core/platform/bundles/paas-hosted.yaml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ releases:
139139
releaseName: dashboard
140140
chart: cozy-dashboard
141141
namespace: cozy-dashboard
142-
{{- if .Capabilities.APIVersions.Has "source.toolkit.fluxcd.io/v1" }}
143-
{{- with (lookup "source.toolkit.fluxcd.io/v1" "HelmRepository" "cozy-public" "").items }}
144142
values:
143+
{{- if .Capabilities.APIVersions.Has "source.toolkit.fluxcd.io/v1" }}
144+
{{- with (lookup "source.toolkit.fluxcd.io/v1" "HelmRepository" "cozy-public" "").items }}
145145
kubeapps:
146146
redis:
147147
master:
@@ -151,14 +151,17 @@ releases:
151151
repository.cozystack.io/{{ $repo.metadata.name }}: {{ quote . }}
152152
{{- end }}
153153
{{- end }}
154-
{{- end }}
155-
{{- end }}
154+
{{- end }}
155+
{{- end }}
156+
157+
{{- $dashboardKCconfig := lookup "v1" "ConfigMap" "cozy-dashboard" "kubeapps-auth-config" }}
158+
{{- $dashboardKCValues := dig "data" "values.yaml" "" $dashboardKCconfig }}
159+
{{- if $dashboardKCValues }}
160+
{{- $dashboardKCValues | nindent 4 }}
161+
{{- end }}
162+
156163
{{- if eq $oidcEnabled "true" }}
157164
dependsOn: [keycloak-configure]
158-
valuesFrom:
159-
- kind: ConfigMap
160-
name: kubeapps-auth-config
161-
valuesKey: values.yaml
162165
{{- else }}
163166
dependsOn: []
164167
{{- end }}

‎packages/system/dashboard/images/dashboard/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
FROM bitnami/node:20.15.1 AS build
55
WORKDIR /app
66

7-
ARG VERSION=2.11.0
7+
ARG VERSION=2.12.0
88
RUN wget -O- https://github.com/vmware-tanzu/kubeapps/archive/refs/tags/v${VERSION}.tar.gz | tar xzf - --strip-components=2 kubeapps-${VERSION}/dashboard
99

1010
COPY apple-touch-icon.png favicon-16x16.png favicon-32x32.png favicon.ico mstile-144x144.png mstile-150x150.png mstile-310x150.png mstile-310x310.png mstile-70x70.png safari-pinned-tab.svg public/

‎packages/system/dashboard/images/kubeapps-apis/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# syntax = docker/dockerfile:1
55

66
FROM alpine as source
7-
ARG VERSION=v2.11.0
7+
ARG VERSION=v2.12.0
88
RUN apk add --no-cache patch
99
WORKDIR /source
1010
RUN wget -O- https://github.com/vmware-tanzu/kubeapps/archive/refs/tags/${VERSION}.tar.gz | tar xzf - --strip-components=1
@@ -17,7 +17,7 @@ RUN patch -p1 < /patches/labels.diff
1717
RUN patch -p1 < /patches/reconcile-strategy.diff
1818
RUN patch -p1 < /patches/dashboard-resource.diff
1919

20-
FROM bitnami/golang:1.22.5 AS builder
20+
FROM bitnami/golang:1.23.4 AS builder
2121
WORKDIR /go/src/github.com/vmware-tanzu/kubeapps
2222
COPY --from=source /source/go.mod /source/go.sum ./
2323
ARG VERSION="devel"

‎packages/system/dashboard/images/kubeapps-apis/dashboard-resource.diff‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/server.go b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/server.go
2-
index 53fac6474..4602a1148 100644
2+
index ef3d506b3..a69f8552f 100644
33
--- a/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/server.go
44
+++ b/cmd/kubeapps-apis/plugins/fluxv2/packages/v1alpha1/server.go
55
@@ -5,6 +5,7 @@ package main
@@ -11,8 +11,8 @@ index 53fac6474..4602a1148 100644
1111
"net/http"
1212

1313
@@ -16,7 +17,6 @@ import (
14-
helmv2beta2 "github.com/fluxcd/helm-controller/api/v2beta2"
15-
sourcev1beta2 "github.com/fluxcd/source-controller/api/v1beta2"
14+
helmv2 "github.com/fluxcd/helm-controller/api/v2"
15+
sourcev1 "github.com/fluxcd/source-controller/api/v1"
1616
authorizationv1 "k8s.io/api/authorization/v1"
1717
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1818
"k8s.io/apimachinery/pkg/runtime"

0 commit comments

Comments
 (0)