Skip to content

Commit e2025e3

Browse files
committed
chore(k8s/amour/rook-ceph): upgrade to v1.14.2
1 parent 6533590 commit e2025e3

File tree

7 files changed

+42
-29
lines changed

7 files changed

+42
-29
lines changed

k8s/amour/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ cue_export(
5252
"//k8s/amour/speedtest_exporter:cue_speedtest_exporter_library",
5353
"//k8s/amour/tailscale:cue_tailscale_library",
5454
"//k8s/amour/thomas:cue_thomas_library",
55-
"//k8s/amour/trivy_system:cue_trivy_system_library",
5655
"//k8s/amour/vector:cue_vector_library",
5756
"//k8s/amour/victoria_logs:cue_victoria_logs_library",
5857
"//k8s/amour/vm:cue_vm_library",

k8s/amour/rook_ceph/cluster_role_list.cue

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,31 @@ import (
6464
}, {
6565
apiGroups: ["snapshot.storage.k8s.io"]
6666
resources: ["volumesnapshots"]
67-
verbs: ["get", "list"]
67+
verbs: ["get", "list", "watch", "update", "patch", "create"]
6868
}, {
6969
apiGroups: ["snapshot.storage.k8s.io"]
7070
resources: ["volumesnapshotclasses"]
7171
verbs: ["get", "list", "watch"]
7272
}, {
7373
apiGroups: ["snapshot.storage.k8s.io"]
7474
resources: ["volumesnapshotcontents"]
75-
verbs: ["get", "list", "watch", "patch", "update"]
75+
verbs: ["get", "list", "watch", "patch", "update", "create"]
7676
}, {
7777
apiGroups: ["snapshot.storage.k8s.io"]
7878
resources: ["volumesnapshotcontents/status"]
7979
verbs: ["update", "patch"]
80+
}, {
81+
apiGroups: ["groupsnapshot.storage.k8s.io"]
82+
resources: ["volumegroupsnapshotclasses"]
83+
verbs: ["get", "list", "watch"]
84+
}, {
85+
apiGroups: ["groupsnapshot.storage.k8s.io"]
86+
resources: ["volumegroupsnapshotcontents"]
87+
verbs: ["get", "list", "watch", "update", "patch"]
88+
}, {
89+
apiGroups: ["groupsnapshot.storage.k8s.io"]
90+
resources: ["volumegroupsnapshotcontents/status"]
91+
verbs: ["update", "patch"]
8092
}]
8193
}, {
8294
metadata: {
@@ -161,19 +173,31 @@ import (
161173
}, {
162174
apiGroups: ["snapshot.storage.k8s.io"]
163175
resources: ["volumesnapshots"]
164-
verbs: ["get", "list", "watch"]
176+
verbs: ["get", "list", "watch", "update", "patch", "create"]
165177
}, {
166178
apiGroups: ["snapshot.storage.k8s.io"]
167179
resources: ["volumesnapshotclasses"]
168180
verbs: ["get", "list", "watch"]
169181
}, {
170182
apiGroups: ["snapshot.storage.k8s.io"]
171183
resources: ["volumesnapshotcontents"]
172-
verbs: ["get", "list", "watch", "patch", "update"]
184+
verbs: ["get", "list", "watch", "patch", "update", "create"]
173185
}, {
174186
apiGroups: ["snapshot.storage.k8s.io"]
175187
resources: ["volumesnapshotcontents/status"]
176188
verbs: ["update", "patch"]
189+
}, {
190+
apiGroups: ["groupsnapshot.storage.k8s.io"]
191+
resources: ["volumegroupsnapshotclasses"]
192+
verbs: ["get", "list", "watch"]
193+
}, {
194+
apiGroups: ["groupsnapshot.storage.k8s.io"]
195+
resources: ["volumegroupsnapshotcontents"]
196+
verbs: ["get", "list", "watch", "update", "patch"]
197+
}, {
198+
apiGroups: ["groupsnapshot.storage.k8s.io"]
199+
resources: ["volumegroupsnapshotcontents/status"]
200+
verbs: ["update", "patch"]
177201
}, {
178202
apiGroups: [v1.#GroupName]
179203
resources: ["configmaps"]

k8s/amour/rook_ceph/list.cue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
#Name: "rook-ceph"
1010
#Namespace: #Name
11-
#Version: "1.13.0.166.gbc78b6cad"
11+
#Version: "1.14.2"
1212

1313
#List: v1.#List & {
1414
apiVersion: "v1"

k8s/amour/rook_ceph/role_binding_list.cue

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -116,18 +116,6 @@ import rbacv1 "k8s.io/api/rbac/v1"
116116
kind: rbacv1.#ServiceAccountKind
117117
name: "rook-ceph-purge-osd"
118118
}]
119-
}, {
120-
// Allow the rgw pods in this namespace to work with configmaps
121-
metadata: name: "rook-ceph-rgw"
122-
roleRef: {
123-
apiGroup: rbacv1.#GroupName
124-
kind: "Role"
125-
name: "rook-ceph-rgw"
126-
}
127-
subjects: [{
128-
kind: rbacv1.#ServiceAccountKind
129-
name: "rook-ceph-rgw"
130-
}]
131119
}, {
132120
// Grant the operator, agent, and discovery agents access to resources in the rook-ceph-system namespace
133121
metadata: {

k8s/amour/rook_ceph/role_list.cue

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,6 @@ import (
110110
resources: ["persistentvolumeclaims"]
111111
verbs: ["get", "update", "delete", "list"]
112112
}]
113-
}, {
114-
metadata: name: "rook-ceph-rgw"
115-
rules: [{
116-
// Placeholder role so the rgw service account will
117-
// be generated in the csv. Remove this role and role binding
118-
// when fixing https://github.com/rook/rook/issues/10141.
119-
apiGroups: [v1.#GroupName]
120-
resources: ["configmaps"]
121-
verbs: ["get"]
122-
}]
123113
}, {
124114
// Allow the operator to manage resources in its own namespace
125115
metadata: {

k8s/amour/rook_ceph/service_account_list.cue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@ import "k8s.io/api/core/v1"
2121
"app.kubernetes.io/part-of": "rook-ceph-operator"
2222
}
2323
}
24+
}, {
25+
metadata: {
26+
name: "rook-ceph-default"
27+
labels: {
28+
operator: "rook"
29+
"storage-backend": "ceph"
30+
}
31+
}
2432
}, {
2533
// Service account for Ceph mgrs
2634
metadata: {

k8s/amour/thomas/BUILD.bazel

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@ load("@com_github_tnarg_rules_cue//cue:cue.bzl", "cue_library")
33
cue_library(
44
name = "cue_thomas_library",
55
srcs = [
6+
"job_list.cue",
67
"list.cue",
78
"namespace_list.cue",
89
],
910
importpath = "github.com/uhthomas/automata/k8s/amour/thomas",
1011
visibility = ["//visibility:public"],
11-
deps = ["//cue.mod/gen/k8s.io/api/core/v1:cue_v1_library"],
12+
deps = [
13+
"//cue.mod/gen/k8s.io/api/batch/v1:cue_v1_library",
14+
"//cue.mod/gen/k8s.io/api/core/v1:cue_v1_library",
15+
],
1216
)

0 commit comments

Comments
 (0)