Skip to content

Commit 00f7c36

Browse files
authored
Upd dashboard and handle ResourceView (#262)
- Patch Dashboard to use specific role for resourceview - Update kubeapps v2.11.0 partially fixes #259 --------- Signed-off-by: Andrei Kvapil <[email protected]>
1 parent cdb60f0 commit 00f7c36

146 files changed

Lines changed: 1635 additions & 1297 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: Role
3+
metadata:
4+
name: {{ .Release.Name }}-dashboard-resources
5+
rules:
6+
- apiGroups:
7+
- networking.k8s.io
8+
resources:
9+
- ingresses
10+
resourceNames:
11+
- {{ .Release.Name }}
12+
verbs: ["get", "list", "watch"]
13+
- apiGroups:
14+
- ""
15+
resources:
16+
- secrets
17+
resourceNames:
18+
- {{ .Release.Name }}-admin-kubeconfig
19+
verbs: ["get", "list", "watch"]
20+
- apiGroups:
21+
- ""
22+
resources:
23+
- services
24+
resourceNames:
25+
- {{ .Release.Name }}
26+
verbs: ["get", "list", "watch"]
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: Role
3+
metadata:
4+
name: {{ .Release.Name }}-dashboard-resources
5+
rules:
6+
- apiGroups:
7+
- ""
8+
resources:
9+
- services
10+
resourceNames:
11+
- postgres-service-r
12+
- postgres-service-ro
13+
- postgres-service-rw
14+
verbs: ["get", "list", "watch"]

‎packages/apps/tenant/templates/tenant.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ rules:
2323
- apiGroups: [""]
2424
resources: ["*"]
2525
verbs: ["get", "list", "watch", "create", "update", "patch"]
26+
- apiGroups: ["networking.k8s.io"]
27+
resources: ["ingresses"]
28+
verbs: ["get", "list", "watch"]
29+
- apiGroups: ["rbac.authorization.k8s.io"]
30+
resources: ["roles"]
31+
verbs: ["get"]
2632
- apiGroups: ["helm.toolkit.fluxcd.io"]
2733
resources: ["helmreleases"]
2834
verbs: ["*"]
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: Role
3+
metadata:
4+
name: {{ .Release.Name }}-dashboard-resources
5+
rules:
6+
- apiGroups:
7+
- networking.k8s.io
8+
resources:
9+
- ingresses
10+
resourceNames:
11+
- grafana-ingress
12+
verbs: ["get", "list", "watch"]
13+
- apiGroups:
14+
- ""
15+
resources:
16+
- secrets
17+
resourceNames:
18+
- grafana-admin-password
19+
verbs: ["get", "list", "watch"]
20+
- apiGroups:
21+
- ""
22+
resources:
23+
- services
24+
resourceNames:
25+
- grafana-service
26+
verbs: ["get", "list", "watch"]

‎packages/system/dashboard/Makefile‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ update-chart:
1313
helm repo update bitnami
1414
helm pull bitnami/kubeapps --untar --untardir charts
1515
rm -rf charts/kubeapps/charts/postgresql/
16-
ln -s ../../images charts/kubeapps/images
1716
sed -i 's/.cluster.local//g' charts/kubeapps/templates/kubeappsapis/deployment.yaml
1817
patch --no-backup-if-mismatch charts/kubeapps/templates/frontend/configmap.yaml < patches/logos.patch
1918

@@ -35,7 +34,15 @@ image-dashboard:
3534
--metadata-file images/dashboard.json \
3635
--push=$(PUSH) \
3736
--load=$(LOAD)
38-
echo "$(REGISTRY)/dashboard:$(call settag,$(TAG))" > images/dashboard.tag
37+
REGISTRY="$(REGISTRY)" \
38+
yq -i '.kubeapps.dashboard.image.registry = strenv(REGISTRY)' values.yaml
39+
REPOSITORY="dashboard" \
40+
yq -i '.kubeapps.dashboard.image.repository = strenv(REPOSITORY)' values.yaml
41+
TAG="$(call settag,$(TAG))" \
42+
yq -i '.kubeapps.dashboard.image.tag = strenv(TAG)' values.yaml
43+
DIGEST=$$(yq e '."containerimage.digest"' images/dashboard.json -o json -r) \
44+
yq -i '.kubeapps.dashboard.image.digest = strenv(DIGEST)' values.yaml
45+
rm -f images/dashboard.json
3946

4047
image-kubeapps-apis:
4148
docker buildx build images/kubeapps-apis \
@@ -46,4 +53,12 @@ image-kubeapps-apis:
4653
--metadata-file images/kubeapps-apis.json \
4754
--push=$(PUSH) \
4855
--load=$(LOAD)
49-
echo "$(REGISTRY)/kubeapps-apis:$(call settag,$(TAG))" > images/kubeapps-apis.tag
56+
REGISTRY="$(REGISTRY)" \
57+
yq -i '.kubeapps.kubeappsapis.image.registry = strenv(REGISTRY)' values.yaml
58+
REPOSITORY="kubeapps-apis" \
59+
yq -i '.kubeapps.kubeappsapis.image.repository = strenv(REPOSITORY)' values.yaml
60+
TAG="$(call settag,$(TAG))" \
61+
yq -i '.kubeapps.kubeappsapis.image.tag = strenv(TAG)' values.yaml
62+
DIGEST=$$(yq e '."containerimage.digest"' images/kubeapps-apis.json -o json -r) \
63+
yq -i '.kubeapps.kubeappsapis.image.digest = strenv(DIGEST)' values.yaml
64+
rm -f images/kubeapps-apis.json

‎packages/system/dashboard/charts/kubeapps/.helmignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@
2424
*.tmproj
2525
# img folder
2626
img/
27+
# Changelog
28+
CHANGELOG.md
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
dependencies:
22
- name: redis
33
repository: oci://registry-1.docker.io/bitnamicharts
4-
version: 19.0.2
4+
version: 19.6.3
55
- name: postgresql
66
repository: oci://registry-1.docker.io/bitnamicharts
7-
version: 15.2.4
7+
version: 15.5.19
88
- name: common
99
repository: oci://registry-1.docker.io/bitnamicharts
10-
version: 2.19.1
11-
digest: sha256:2ff034d67cb1b9c11f0243b3ab9a6a8642bf12142df2f86043f9006adf6dbba1
12-
generated: "2024-04-08T09:01:34.727544997Z"
10+
version: 2.20.5
11+
digest: sha256:eb2c690088e9dd237a1443aeedcf71419d5d4efe6999cf9e352b5407c005c6bc
12+
generated: "2024-07-25T06:10:39.073759816Z"

‎packages/system/dashboard/charts/kubeapps/Chart.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@ annotations:
22
category: Infrastructure
33
images: |
44
- name: kubeapps-apis
5-
image: docker.io/bitnami/kubeapps-apis:2.10.0-debian-12-r0
5+
image: docker.io/bitnami/kubeapps-apis:2.11.0-debian-12-r2
66
- name: kubeapps-apprepository-controller
7-
image: docker.io/bitnami/kubeapps-apprepository-controller:2.10.0-debian-12-r0
7+
image: docker.io/bitnami/kubeapps-apprepository-controller:2.11.0-debian-12-r2
88
- name: kubeapps-asset-syncer
9-
image: docker.io/bitnami/kubeapps-asset-syncer:2.10.0-debian-12-r0
9+
image: docker.io/bitnami/kubeapps-asset-syncer:2.11.0-debian-12-r2
1010
- name: kubeapps-dashboard
11-
image: docker.io/bitnami/kubeapps-dashboard:2.10.0-debian-12-r0
11+
image: docker.io/bitnami/kubeapps-dashboard:2.11.0-debian-12-r2
1212
- name: kubeapps-oci-catalog
13-
image: docker.io/bitnami/kubeapps-oci-catalog:2.10.0-debian-12-r0
13+
image: docker.io/bitnami/kubeapps-oci-catalog:2.11.0-debian-12-r2
1414
- name: kubeapps-pinniped-proxy
15-
image: docker.io/bitnami/kubeapps-pinniped-proxy:2.10.0-debian-12-r0
15+
image: docker.io/bitnami/kubeapps-pinniped-proxy:2.11.0-debian-12-r2
1616
- name: nginx
17-
image: docker.io/bitnami/nginx:1.25.4-debian-12-r7
17+
image: docker.io/bitnami/nginx:1.27.0-debian-12-r4
1818
- name: oauth2-proxy
19-
image: docker.io/bitnami/oauth2-proxy:7.6.0-debian-12-r7
19+
image: docker.io/bitnami/oauth2-proxy:7.6.0-debian-12-r17
2020
licenses: Apache-2.0
2121
apiVersion: v2
22-
appVersion: 2.10.0
22+
appVersion: 2.11.0
2323
dependencies:
2424
- condition: packaging.flux.enabled
2525
name: redis
@@ -46,9 +46,9 @@ keywords:
4646
- deployment
4747
kubeVersion: '>=1.21.0-0'
4848
maintainers:
49-
- name: VMware, Inc.
49+
- name: Broadcom, Inc. All Rights Reserved.
5050
url: https://github.com/bitnami/charts
5151
name: kubeapps
5252
sources:
5353
- https://github.com/bitnami/charts/tree/main/bitnami/kubeapps
54-
version: 15.0.2
54+
version: 15.3.10

0 commit comments

Comments
 (0)