Skip to content

Commit 017d33b

Browse files
authored
Merge pull request #16 from spring-financial-group/feat/update-tekton-dash
2 parents 0c013b8 + 6af78ee commit 017d33b

15 files changed

+109
-68
lines changed

.github/workflows/lint-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
- uses: actions/setup-python@v2
2020
with:
21-
python-version: 3.7
21+
python-version: 3.13.7
2222

2323
- name: Set up chart-testing
2424
uses: helm/[email protected]

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ To fetch a specific version (say 0.32.0), use CHART_VERSION
2828
make CHART_VERSION=0.32.0 fetch
2929
```
3030

31-
Also, remember to change the `version` in `charts/tekton-dashboard/Chart.yaml`.
32-
The `app_version` will be set to the `CHART_VERSION` automatically by the makefile if a `CHART_VERSION` is specified.
33-
For latest set `app_version` to the latest tekton version from the [tekton release page](https://github.com/tektoncd/dashboard/releases) and not `latest`.
31+
#### Versioning
32+
`appVersion` is automatically set during the `make fetch` process. Set as the version pulled from Tekton.
33+
34+
`chartVersion` is automatically set during the [publish workflow](.github/workflows/publish.yml). Set based on the semantic commits within the causal PR.
3435

3536
### Other use cases
3637

charts/tekton-dashboard/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
description: A Helm chart for Tekton Pipelines Dashboard
33
name: tekton-dashboard
44
version: 0.1.2
5-
appVersion: "0.35.0"
5+
appVersion: "0.61.0"
66
icon: https://avatars2.githubusercontent.com/u/47602533
77
home: https://github.com/jenkins-x/tekton-dashboard-helm-chart
88
dependencies:

charts/tekton-dashboard/templates/dashboard-info-cm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v1
22
data:
3-
version: v0.35.0
3+
version: v0.61.0
44
kind: ConfigMap
55
metadata:
66
labels:

charts/tekton-dashboard/templates/extensions.dashboard.tekton.dev-crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
- jsonPath: .spec.name
2828
name: Kind
2929
type: string
30-
- jsonPath: .spec.displayname
30+
- jsonPath: .spec.displayName
3131
name: Display name
3232
type: string
3333
- jsonPath: .metadata.creationTimestamp
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: ClusterRole
3+
metadata:
4+
labels:
5+
app.kubernetes.io/component: dashboard
6+
app.kubernetes.io/instance: default
7+
app.kubernetes.io/part-of: tekton-dashboard
8+
name: tekton-dashboard-backend-edit
9+
rules:
10+
- apiGroups:
11+
- ""
12+
resources:
13+
- serviceaccounts
14+
verbs:
15+
- get
16+
- list
17+
- watch
18+
- apiGroups:
19+
- dashboard.tekton.dev
20+
resources:
21+
- extensions
22+
verbs:
23+
- create
24+
- update
25+
- delete
26+
- patch

charts/tekton-dashboard/templates/tekton-dashboard-backend-clusterrole.yaml renamed to charts/tekton-dashboard/templates/tekton-dashboard-backend-view-clusterrole.yaml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/component: dashboard
66
app.kubernetes.io/instance: default
77
app.kubernetes.io/part-of: tekton-dashboard
8-
name: tekton-dashboard-backend
8+
name: tekton-dashboard-backend-view
99
rules:
1010
- apiGroups:
1111
- apiextensions.k8s.io
@@ -20,20 +20,3 @@ rules:
2020
- securitycontextconstraints
2121
verbs:
2222
- use
23-
- apiGroups:
24-
- tekton.dev
25-
resources:
26-
- clustertasks
27-
verbs:
28-
- get
29-
- list
30-
- watch
31-
- apiGroups:
32-
- triggers.tekton.dev
33-
resources:
34-
- clusterinterceptors
35-
- clustertriggerbindings
36-
verbs:
37-
- get
38-
- list
39-
- watch
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: ClusterRoleBinding
3+
metadata:
4+
labels:
5+
app.kubernetes.io/component: dashboard
6+
app.kubernetes.io/instance: default
7+
app.kubernetes.io/part-of: tekton-dashboard
8+
rbac.dashboard.tekton.dev/subject: tekton-dashboard
9+
name: tekton-dashboard-backend-view
10+
roleRef:
11+
apiGroup: rbac.authorization.k8s.io
12+
kind: ClusterRole
13+
name: tekton-dashboard-backend-view
14+
subjects:
15+
- kind: ServiceAccount
16+
name: tekton-dashboard
17+
namespace: '{{ .Release.Namespace }}'

charts/tekton-dashboard/templates/tekton-dashboard-deploy.yaml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ metadata:
77
app.kubernetes.io/instance: default
88
app.kubernetes.io/name: dashboard
99
app.kubernetes.io/part-of: tekton-dashboard
10-
app.kubernetes.io/version: v0.35.0
11-
dashboard.tekton.dev/release: v0.35.0
12-
version: v0.35.0
10+
app.kubernetes.io/version: v0.61.0
11+
dashboard.tekton.dev/release: v0.61.0
12+
version: v0.61.0
1313
name: tekton-dashboard
1414
spec:
1515
replicas: 1
@@ -27,9 +27,29 @@ spec:
2727
app.kubernetes.io/instance: default
2828
app.kubernetes.io/name: dashboard
2929
app.kubernetes.io/part-of: tekton-dashboard
30-
app.kubernetes.io/version: v0.35.0
30+
app.kubernetes.io/version: v0.61.0
3131
name: tekton-dashboard
3232
spec:
33+
affinity:
34+
nodeAffinity:
35+
requiredDuringSchedulingIgnoredDuringExecution:
36+
nodeSelectorTerms:
37+
- matchExpressions:
38+
- key: kubernetes.io/os
39+
operator: NotIn
40+
values:
41+
- windows
42+
podAntiAffinity:
43+
preferredDuringSchedulingIgnoredDuringExecution:
44+
- podAffinityTerm:
45+
labelSelector:
46+
matchLabels:
47+
app.kubernetes.io/component: dashboard
48+
app.kubernetes.io/instance: default
49+
app.kubernetes.io/name: dashboard
50+
app.kubernetes.io/part-of: tekton-dashboard
51+
topologyKey: kubernetes.io/hostname
52+
weight: 100
3353
containers:
3454
- args:
3555
{{- range $key, $value := .Values.args }}
@@ -40,7 +60,7 @@ spec:
4060
valueFrom:
4161
fieldRef:
4262
fieldPath: metadata.namespace
43-
image: gcr.io/tekton-releases/github.com/tektoncd/dashboard/cmd/dashboard:v0.35.0@sha256:057471aa317c900e30178d64d83fc9d32cf2fcd718632243f7b902403b64981b
63+
image: ghcr.io/tektoncd/dashboard/dashboard-9623576a202fe86c8b7d1bc489905f86:v0.61.0@sha256:32c8bb482129b42c5b09a29b34140aed53dc3ade1d7e24fef7a194075d1c87c7
4464
livenessProbe:
4565
httpGet:
4666
path: /health

charts/tekton-dashboard/templates/tekton-dashboard-backend-crb.yaml renamed to charts/tekton-dashboard/templates/tekton-dashboard-pipelines-view-crb.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ metadata:
66
app.kubernetes.io/instance: default
77
app.kubernetes.io/part-of: tekton-dashboard
88
rbac.dashboard.tekton.dev/subject: tekton-dashboard
9-
name: tekton-dashboard-backend
9+
name: tekton-dashboard-pipelines-view
1010
roleRef:
1111
apiGroup: rbac.authorization.k8s.io
1212
kind: ClusterRole
13-
name: tekton-dashboard-backend
13+
name: tekton-aggregate-view
1414
subjects:
1515
- kind: ServiceAccount
1616
name: tekton-dashboard

0 commit comments

Comments
 (0)