Skip to content

Commit 81c14a9

Browse files
authored
Merge branch 'main' into list-on-hover#3232
2 parents 709f47f + 1663b93 commit 81c14a9

File tree

141 files changed

+1433
-468
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+1433
-468
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ For contributing to the Headlamp project, please refer check out our:
1515
Since Headlamp is part of the Kubernetes Community, please read also:
1616

1717
- [Contributor License Agreement](https://git.k8s.io/community/CLA.md) Kubernetes projects require that you sign a Contributor License Agreement (CLA) before we can accept your pull requests
18-
- [Kubernetes Contributor Guide](http://git.k8s.io/community/contributors/guide) - Main contributor documentation, or you can just jump directly to the [contributing section](https://git.k8s.io/community/contributors/guide#contributing)
18+
- [Kubernetes Contributor Guide](https://git.k8s.io/community/contributors/guide) - Main contributor documentation, or you can just jump directly to the [contributing section](https://git.k8s.io/community/contributors/guide#contributing)
1919
- [Contributor Cheat Sheet](https://git.k8s.io/community/contributors/guide/contributor-cheatsheet/README.md) - Common resources for existing developers

charts/headlamp/templates/deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ metadata:
4141
name: {{ include "headlamp.fullname" . }}
4242
labels:
4343
{{- include "headlamp.labels" . | nindent 4 }}
44+
{{- with .Values.deploymentAnnotations }}
45+
annotations:
46+
{{- toYaml . | nindent 4 }}
47+
{{- end }}
4448
spec:
4549
replicas: {{ .Values.replicaCount }}
4650
selector:

charts/headlamp/tests/expected_templates/oidc-validator-overrides.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ kind: ServiceAccount
55
metadata:
66
name: headlamp
77
labels:
8-
helm.sh/chart: headlamp-0.28.0
8+
helm.sh/chart: headlamp-0.30.1
99
app.kubernetes.io/name: headlamp
1010
app.kubernetes.io/instance: headlamp
11-
app.kubernetes.io/version: "0.28.0"
11+
app.kubernetes.io/version: "0.30.0"
1212
app.kubernetes.io/managed-by: Helm
1313
---
1414
# Source: headlamp/templates/clusterrolebinding.yaml
@@ -17,10 +17,10 @@ kind: ClusterRoleBinding
1717
metadata:
1818
name: headlamp-admin
1919
labels:
20-
helm.sh/chart: headlamp-0.28.0
20+
helm.sh/chart: headlamp-0.30.1
2121
app.kubernetes.io/name: headlamp
2222
app.kubernetes.io/instance: headlamp
23-
app.kubernetes.io/version: "0.28.0"
23+
app.kubernetes.io/version: "0.30.0"
2424
app.kubernetes.io/managed-by: Helm
2525
roleRef:
2626
apiGroup: rbac.authorization.k8s.io
@@ -37,10 +37,10 @@ kind: Service
3737
metadata:
3838
name: headlamp
3939
labels:
40-
helm.sh/chart: headlamp-0.28.0
40+
helm.sh/chart: headlamp-0.30.1
4141
app.kubernetes.io/name: headlamp
4242
app.kubernetes.io/instance: headlamp
43-
app.kubernetes.io/version: "0.28.0"
43+
app.kubernetes.io/version: "0.30.0"
4444
app.kubernetes.io/managed-by: Helm
4545
spec:
4646
type: ClusterIP
@@ -63,10 +63,10 @@ kind: Deployment
6363
metadata:
6464
name: headlamp
6565
labels:
66-
helm.sh/chart: headlamp-0.28.0
66+
helm.sh/chart: headlamp-0.30.1
6767
app.kubernetes.io/name: headlamp
6868
app.kubernetes.io/instance: headlamp
69-
app.kubernetes.io/version: "0.28.0"
69+
app.kubernetes.io/version: "0.30.0"
7070
app.kubernetes.io/managed-by: Helm
7171
spec:
7272
replicas: 1
@@ -90,7 +90,7 @@ spec:
9090
runAsGroup: 101
9191
runAsNonRoot: true
9292
runAsUser: 100
93-
image: "ghcr.io/headlamp-k8s/headlamp:v0.28.0"
93+
image: "ghcr.io/headlamp-k8s/headlamp:v0.30.0"
9494
imagePullPolicy: IfNotPresent
9595

9696
env:

charts/headlamp/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ clusterRoleBinding:
118118
# -- Annotations to add to the cluster role binding
119119
annotations: {}
120120

121+
# -- Annotations to add to the deployment
122+
deploymentAnnotations: {}
123+
121124
# -- Annotations to add to the pod
122125
podAnnotations: {}
123126

0 commit comments

Comments
 (0)