Skip to content

Commit 6c73e3f

Browse files
committed
feature/mv-kubeconfig
1 parent bc95159 commit 6c73e3f

16 files changed

Lines changed: 109 additions & 10 deletions

File tree

‎packages/apps/tenant/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ description: Separated tenant namespace
44
icon: /logos/tenant.svg
55

66
type: application
7-
version: 1.6.8
7+
version: 1.7.0
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
2+
{{- $oidcEnabled := index $cozyConfig.data "oidc-enabled" }}
3+
{{- if $oidcEnabled }}
4+
apiVersion: helm.toolkit.fluxcd.io/v2
5+
kind: HelmRelease
6+
metadata:
7+
name: info
8+
namespace: {{ include "tenant.name" . }}
9+
annotations:
10+
helm.sh/resource-policy: keep
11+
labels:
12+
cozystack.io/ui: "true"
13+
app.kubernetes.io/instance: {{ .Release.Name }}
14+
app.kubernetes.io/managed-by: {{ .Release.Service }}
15+
spec:
16+
chart:
17+
spec:
18+
chart: info
19+
reconcileStrategy: Revision
20+
sourceRef:
21+
kind: HelmRepository
22+
name: cozystack-extra
23+
namespace: cozy-public
24+
version: "*"
25+
interval: 1m0s
26+
timeout: 5m0s
27+
{{- end }}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ rules:
272272
- virtualmachines
273273
- vmdisks
274274
- vminstances
275+
- infos
275276
verbs:
276277
- get
277278
- list

‎packages/apps/versions_map‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ tenant 1.6.4 3c9e50a4
102102
tenant 1.6.5 f1e11451
103103
tenant 1.6.6 d4634797
104104
tenant 1.6.7 06afcf27
105-
tenant 1.6.8 HEAD
105+
tenant 1.6.8 4cc48e6f
106+
tenant 1.7.0 HEAD
106107
virtual-machine 0.1.4 f2015d6
107108
virtual-machine 0.1.5 7cd7de7
108109
virtual-machine 0.2.0 5ca8823

‎packages/extra/info/.helmignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.helmignore
2+
/logos

‎packages/extra/info/Chart.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: v2
2+
name: info
3+
description: Info
4+
icon: /logos/info.svg
5+
type: application
6+
version: 1.0.0

‎packages/extra/info/Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
NAME=etcd
2+
3+
include ../../../scripts/package.mk

‎packages/extra/info/README.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Info
2+
3+
### Kubeconfig for tenant
4+
5+
### Kubelogin
6+
7+
For using kubeconfig need install kubelogin.
8+
9+
```bash
10+
# Homebrew (macOS and Linux)
11+
brew install int128/kubelogin/kubelogin
12+
13+
# Krew (macOS, Linux, Windows and ARM)
14+
kubectl krew install oidc-login
15+
16+
# Chocolatey (Windows)
17+
choco install kubelogin
18+
```

‎packages/extra/info/logos/info.svg‎

Lines changed: 13 additions & 0 deletions
Loading

packages/apps/tenant/templates/dashboard-resourcemap.yaml renamed to packages/extra/info/templates/dashboard-resourcemap.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
apiVersion: rbac.authorization.k8s.io/v1
22
kind: Role
33
metadata:
4-
name: {{ include "tenant.name" . }}-dashboard-resources
5-
namespace: {{ .Release.namespace }}
4+
name: info-dashboard-resources
65
rules:
76
- apiGroups:
87
- ""
98
resources:
109
- secrets
1110
resourceNames:
12-
- kubeconfig-{{ include "tenant.name" . }}
11+
- kubeconfig-{{ .Release.Namespace }}
1312
verbs: ["get", "list", "watch"]

0 commit comments

Comments
 (0)