Skip to content

Commit 2e43e51

Browse files
committed
Remove certain parts of the pod security context that has caused trouble on certain platforms.
Signed-off-by: Pete Wall <pete.wall@grafana.com>
1 parent 84a3da2 commit 2e43e51

File tree

18 files changed

+71
-386
lines changed

18 files changed

+71
-386
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The Alloy Operator is a Kubernetes Operator that manages the lifecycle of
1111

1212
| Component | Version |
1313
|------------------|---------|
14-
| Alloy Operator | 0.3.15 |
14+
| Alloy Operator | 0.4.0 |
1515
| Alloy Helm chart | 1.5.1 |
1616
| Alloy binary | v1.12.1 |
1717

charts/alloy-operator/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
# Changelog
22

3+
## 0.4.0
4+
5+
* Remove some of the special pod security contexts, because their values may cause issues on certain platforms (@petewall)
6+
37
## 0.3.15
48

9+
* Update Alloy to 1.5.1 (@petewall)
10+
511
## 0.3.14
612

713
* Update Alloy to 1.5.0 (@petewall)

charts/alloy-operator/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ icon: https://raw.githubusercontent.com/grafana/grafana/main/public/img/grafana_
66
sources:
77
- https://github.com/grafana/alloy-operator
88
type: application
9-
version: 0.3.15
9+
version: 0.4.0
1010
appVersion: "1.5.1"
1111
maintainers:
1212
- email: pete.wall@grafana.com

charts/alloy-operator/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# alloy-operator
77

8-
![Version: 0.3.15](https://img.shields.io/badge/Version-0.3.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.1](https://img.shields.io/badge/AppVersion-1.5.1-informational?style=flat-square)
8+
![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.1](https://img.shields.io/badge/AppVersion-1.5.1-informational?style=flat-square)
99

1010
A Helm chart the Alloy Operator, a project to innovate on creating instances of Grafana Alloy.
1111

@@ -40,7 +40,7 @@ A Helm chart the Alloy Operator, a project to innovate on creating instances of
4040
| nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Set the node selector for the Alloy Operator pods. |
4141
| podAnnotations | object | `{}` | Additional annotations to add to the Alloy Operator pods. |
4242
| podLabels | object | `{}` | Additional labels to add to the Alloy Operator pods. |
43-
| podSecurityContext | object | `{"fsGroup":1000,"runAsGroup":1000,"runAsNonRoot":true,"runAsUser":1000,"seccompProfile":{"type":"RuntimeDefault"}}` | Set the security context for the Alloy Operator pods. |
43+
| podSecurityContext | object | `{"runAsNonRoot":true}` | Set the security context for the Alloy Operator pods. |
4444
| priorityClassName | string | `""` | Sets the priority class name for the Alloy Operator pods. |
4545
| tolerations | list | `[]` | Set the tolerations for the Alloy Operator pods. |
4646

charts/alloy-operator/docs/examples/default/output.yaml

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: test-alloy-operator
77
namespace: operator
88
labels:
9-
helm.sh/chart: alloy-operator-0.3.15
9+
helm.sh/chart: alloy-operator-0.4.0
1010
app.kubernetes.io/name: alloy-operator
1111
app.kubernetes.io/instance: test
1212
app.kubernetes.io/version: "1.5.1"
@@ -19,7 +19,7 @@ kind: ClusterRole
1919
metadata:
2020
name: test-alloy-operator-alloy-manager
2121
labels:
22-
helm.sh/chart: alloy-operator-0.3.15
22+
helm.sh/chart: alloy-operator-0.4.0
2323
app.kubernetes.io/name: alloy-operator
2424
app.kubernetes.io/instance: test
2525
app.kubernetes.io/version: "1.5.1"
@@ -77,7 +77,7 @@ kind: ClusterRoleBinding
7777
metadata:
7878
name: test-alloy-operator-alloy-manager
7979
labels:
80-
helm.sh/chart: alloy-operator-0.3.15
80+
helm.sh/chart: alloy-operator-0.4.0
8181
app.kubernetes.io/name: alloy-operator
8282
app.kubernetes.io/instance: test
8383
app.kubernetes.io/version: "1.5.1"
@@ -97,7 +97,7 @@ kind: ClusterRoleBinding
9797
metadata:
9898
name: test-alloy-operator
9999
labels:
100-
helm.sh/chart: alloy-operator-0.3.15
100+
helm.sh/chart: alloy-operator-0.4.0
101101
app.kubernetes.io/name: alloy-operator
102102
app.kubernetes.io/instance: test
103103
app.kubernetes.io/version: "1.5.1"
@@ -118,7 +118,7 @@ metadata:
118118
name: test-alloy-operator-leader-election-role
119119
namespace: operator
120120
labels:
121-
helm.sh/chart: alloy-operator-0.3.15
121+
helm.sh/chart: alloy-operator-0.4.0
122122
app.kubernetes.io/name: alloy-operator
123123
app.kubernetes.io/instance: test
124124
app.kubernetes.io/version: "1.5.1"
@@ -163,7 +163,7 @@ metadata:
163163
name: test-alloy-operator-leader-election-rolebinding
164164
namespace: operator
165165
labels:
166-
helm.sh/chart: alloy-operator-0.3.15
166+
helm.sh/chart: alloy-operator-0.4.0
167167
app.kubernetes.io/name: alloy-operator
168168
app.kubernetes.io/instance: test
169169
app.kubernetes.io/version: "1.5.1"
@@ -184,7 +184,7 @@ metadata:
184184
name: test-alloy-operator
185185
namespace: operator
186186
labels:
187-
helm.sh/chart: alloy-operator-0.3.15
187+
helm.sh/chart: alloy-operator-0.4.0
188188
app.kubernetes.io/name: alloy-operator
189189
app.kubernetes.io/instance: test
190190
app.kubernetes.io/version: "1.5.1"
@@ -211,7 +211,7 @@ metadata:
211211
name: test-alloy-operator
212212
namespace: operator
213213
labels:
214-
helm.sh/chart: alloy-operator-0.3.15
214+
helm.sh/chart: alloy-operator-0.4.0
215215
app.kubernetes.io/name: alloy-operator
216216
app.kubernetes.io/instance: test
217217
app.kubernetes.io/version: "1.5.1"
@@ -225,20 +225,15 @@ spec:
225225
template:
226226
metadata:
227227
labels:
228-
helm.sh/chart: alloy-operator-0.3.15
228+
helm.sh/chart: alloy-operator-0.4.0
229229
app.kubernetes.io/name: alloy-operator
230230
app.kubernetes.io/instance: test
231231
app.kubernetes.io/version: "1.5.1"
232232
app.kubernetes.io/managed-by: Helm
233233
spec:
234234
serviceAccountName: test-alloy-operator
235235
securityContext:
236-
fsGroup: 1000
237-
runAsGroup: 1000
238236
runAsNonRoot: true
239-
runAsUser: 1000
240-
seccompProfile:
241-
type: RuntimeDefault
242237
containers:
243238
- name: alloy-operator
244239
image: "ghcr.io/grafana/alloy-operator:1.5.1"

charts/alloy-operator/docs/examples/image-by-digest/output.yaml

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: test-alloy-operator
77
namespace: operator
88
labels:
9-
helm.sh/chart: alloy-operator-0.3.15
9+
helm.sh/chart: alloy-operator-0.4.0
1010
app.kubernetes.io/name: alloy-operator
1111
app.kubernetes.io/instance: test
1212
app.kubernetes.io/version: "1.5.1"
@@ -19,7 +19,7 @@ kind: ClusterRole
1919
metadata:
2020
name: test-alloy-operator-alloy-manager
2121
labels:
22-
helm.sh/chart: alloy-operator-0.3.15
22+
helm.sh/chart: alloy-operator-0.4.0
2323
app.kubernetes.io/name: alloy-operator
2424
app.kubernetes.io/instance: test
2525
app.kubernetes.io/version: "1.5.1"
@@ -77,7 +77,7 @@ kind: ClusterRoleBinding
7777
metadata:
7878
name: test-alloy-operator-alloy-manager
7979
labels:
80-
helm.sh/chart: alloy-operator-0.3.15
80+
helm.sh/chart: alloy-operator-0.4.0
8181
app.kubernetes.io/name: alloy-operator
8282
app.kubernetes.io/instance: test
8383
app.kubernetes.io/version: "1.5.1"
@@ -97,7 +97,7 @@ kind: ClusterRoleBinding
9797
metadata:
9898
name: test-alloy-operator
9999
labels:
100-
helm.sh/chart: alloy-operator-0.3.15
100+
helm.sh/chart: alloy-operator-0.4.0
101101
app.kubernetes.io/name: alloy-operator
102102
app.kubernetes.io/instance: test
103103
app.kubernetes.io/version: "1.5.1"
@@ -118,7 +118,7 @@ metadata:
118118
name: test-alloy-operator-leader-election-role
119119
namespace: operator
120120
labels:
121-
helm.sh/chart: alloy-operator-0.3.15
121+
helm.sh/chart: alloy-operator-0.4.0
122122
app.kubernetes.io/name: alloy-operator
123123
app.kubernetes.io/instance: test
124124
app.kubernetes.io/version: "1.5.1"
@@ -163,7 +163,7 @@ metadata:
163163
name: test-alloy-operator-leader-election-rolebinding
164164
namespace: operator
165165
labels:
166-
helm.sh/chart: alloy-operator-0.3.15
166+
helm.sh/chart: alloy-operator-0.4.0
167167
app.kubernetes.io/name: alloy-operator
168168
app.kubernetes.io/instance: test
169169
app.kubernetes.io/version: "1.5.1"
@@ -184,7 +184,7 @@ metadata:
184184
name: test-alloy-operator
185185
namespace: operator
186186
labels:
187-
helm.sh/chart: alloy-operator-0.3.15
187+
helm.sh/chart: alloy-operator-0.4.0
188188
app.kubernetes.io/name: alloy-operator
189189
app.kubernetes.io/instance: test
190190
app.kubernetes.io/version: "1.5.1"
@@ -211,7 +211,7 @@ metadata:
211211
name: test-alloy-operator
212212
namespace: operator
213213
labels:
214-
helm.sh/chart: alloy-operator-0.3.15
214+
helm.sh/chart: alloy-operator-0.4.0
215215
app.kubernetes.io/name: alloy-operator
216216
app.kubernetes.io/instance: test
217217
app.kubernetes.io/version: "1.5.1"
@@ -225,20 +225,15 @@ spec:
225225
template:
226226
metadata:
227227
labels:
228-
helm.sh/chart: alloy-operator-0.3.15
228+
helm.sh/chart: alloy-operator-0.4.0
229229
app.kubernetes.io/name: alloy-operator
230230
app.kubernetes.io/instance: test
231231
app.kubernetes.io/version: "1.5.1"
232232
app.kubernetes.io/managed-by: Helm
233233
spec:
234234
serviceAccountName: test-alloy-operator
235235
securityContext:
236-
fsGroup: 1000
237-
runAsGroup: 1000
238236
runAsNonRoot: true
239-
runAsUser: 1000
240-
seccompProfile:
241-
type: RuntimeDefault
242237
containers:
243238
- name: alloy-operator
244239
image: "ghcr.io/grafana/alloy-operator@sha256:1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"

charts/alloy-operator/docs/examples/namespaced/output.yaml

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: test-alloy-operator
77
namespace: operator
88
labels:
9-
helm.sh/chart: alloy-operator-0.3.15
9+
helm.sh/chart: alloy-operator-0.4.0
1010
app.kubernetes.io/name: alloy-operator
1111
app.kubernetes.io/instance: test
1212
app.kubernetes.io/version: "1.5.1"
@@ -19,7 +19,7 @@ kind: ClusterRole
1919
metadata:
2020
name: test-alloy-operator-alloy-manager
2121
labels:
22-
helm.sh/chart: alloy-operator-0.3.15
22+
helm.sh/chart: alloy-operator-0.4.0
2323
app.kubernetes.io/name: alloy-operator
2424
app.kubernetes.io/instance: test
2525
app.kubernetes.io/version: "1.5.1"
@@ -77,7 +77,7 @@ kind: ClusterRoleBinding
7777
metadata:
7878
name: test-alloy-operator-alloy-manager
7979
labels:
80-
helm.sh/chart: alloy-operator-0.3.15
80+
helm.sh/chart: alloy-operator-0.4.0
8181
app.kubernetes.io/name: alloy-operator
8282
app.kubernetes.io/instance: test
8383
app.kubernetes.io/version: "1.5.1"
@@ -97,7 +97,7 @@ kind: ClusterRoleBinding
9797
metadata:
9898
name: test-alloy-operator
9999
labels:
100-
helm.sh/chart: alloy-operator-0.3.15
100+
helm.sh/chart: alloy-operator-0.4.0
101101
app.kubernetes.io/name: alloy-operator
102102
app.kubernetes.io/instance: test
103103
app.kubernetes.io/version: "1.5.1"
@@ -118,7 +118,7 @@ metadata:
118118
name: test-alloy-operator-leader-election-role
119119
namespace: operator
120120
labels:
121-
helm.sh/chart: alloy-operator-0.3.15
121+
helm.sh/chart: alloy-operator-0.4.0
122122
app.kubernetes.io/name: alloy-operator
123123
app.kubernetes.io/instance: test
124124
app.kubernetes.io/version: "1.5.1"
@@ -163,7 +163,7 @@ metadata:
163163
name: test-alloy-operator-leader-election-rolebinding
164164
namespace: operator
165165
labels:
166-
helm.sh/chart: alloy-operator-0.3.15
166+
helm.sh/chart: alloy-operator-0.4.0
167167
app.kubernetes.io/name: alloy-operator
168168
app.kubernetes.io/instance: test
169169
app.kubernetes.io/version: "1.5.1"
@@ -184,7 +184,7 @@ metadata:
184184
name: test-alloy-operator
185185
namespace: operator
186186
labels:
187-
helm.sh/chart: alloy-operator-0.3.15
187+
helm.sh/chart: alloy-operator-0.4.0
188188
app.kubernetes.io/name: alloy-operator
189189
app.kubernetes.io/instance: test
190190
app.kubernetes.io/version: "1.5.1"
@@ -211,7 +211,7 @@ metadata:
211211
name: test-alloy-operator
212212
namespace: operator
213213
labels:
214-
helm.sh/chart: alloy-operator-0.3.15
214+
helm.sh/chart: alloy-operator-0.4.0
215215
app.kubernetes.io/name: alloy-operator
216216
app.kubernetes.io/instance: test
217217
app.kubernetes.io/version: "1.5.1"
@@ -225,20 +225,15 @@ spec:
225225
template:
226226
metadata:
227227
labels:
228-
helm.sh/chart: alloy-operator-0.3.15
228+
helm.sh/chart: alloy-operator-0.4.0
229229
app.kubernetes.io/name: alloy-operator
230230
app.kubernetes.io/instance: test
231231
app.kubernetes.io/version: "1.5.1"
232232
app.kubernetes.io/managed-by: Helm
233233
spec:
234234
serviceAccountName: test-alloy-operator
235235
securityContext:
236-
fsGroup: 1000
237-
runAsGroup: 1000
238236
runAsNonRoot: true
239-
runAsUser: 1000
240-
seccompProfile:
241-
type: RuntimeDefault
242237
containers:
243238
- name: alloy-operator
244239
image: "ghcr.io/grafana/alloy-operator:1.5.1"

0 commit comments

Comments
 (0)