Skip to content

Commit 9b18534

Browse files
authored
Merge pull request #132 from FyraLabs/main
Update RBAC
2 parents c4f90d3 + ee53caa commit 9b18534

File tree

6 files changed

+60
-15
lines changed

6 files changed

+60
-15
lines changed

Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+36-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
name = "chisel-operator"
3-
version = "0.4.0"
3+
version = "0.4.1"
44
edition = "2021"
55
description = "Chisel tunnel operator for Kubernetes"
66
authors = [
77
"Pornpipat 'Cappy Ishihara' Popum <cappy@fyralabs.com>",
8-
"Lleyton Grey <lleyton@fyralabs.com>"
8+
"Lleyton Grey <lleyton@fyralabs.com>",
99
]
1010
categories = ["Network programming", "Configuration"]
1111
license = "MIT"
@@ -25,7 +25,13 @@ default-run = "chisel-operator"
2525
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
2626

2727
[dependencies]
28-
kube = { version = "0.82.2", features = ["runtime", "derive", "rustls-tls", "jsonpatch", "client",], default-features = false }
28+
kube = { version = "0.82.2", features = [
29+
"runtime",
30+
"derive",
31+
"rustls-tls",
32+
"jsonpatch",
33+
"client",
34+
], default-features = false }
2935
k8s-openapi = { version = "0.18.0", features = ["v1_26"] }
3036
serde = { version = "1.0.204", features = ["derive"] }
3137
serde_json = "1"
@@ -41,18 +47,38 @@ thiserror = "1.0"
4147
tracing-subscriber = { version = "0.3", features = ["json", "env-filter"] }
4248
tracing-logfmt = "0.3.4"
4349
uuid = "1.9"
44-
digitalocean-rs = { version = "0.1.9", default-features = false, features = ["default-rustls"] }
50+
digitalocean-rs = { version = "0.1.9", default-features = false, features = [
51+
"default-rustls",
52+
] }
4553
rand = { version = "0.8.5", features = ["log", "serde"] }
4654
async-trait = "0.1.80"
4755
names = "0.14.0"
48-
linode-rs = { version = "0.1.3", default-features = false, features = ["default-rustls"] }
56+
linode-rs = { version = "0.1.3", default-features = false, features = [
57+
"default-rustls",
58+
] }
4959
base64 = "0.22.0"
5060
trait_enum = "0.5.0"
51-
aws-config = { version = "1.1.1", default-features = false, features = ["rt-tokio", "behavior-version-latest"] }
52-
aws-sdk-ec2 = { version = "1.13.0", default-features = false, features = ["rt-tokio", "behavior-version-latest"] }
53-
aws-sdk-ssm = { version = "1.7.0", default-features = false, features = ["rt-tokio", "behavior-version-latest"] }
54-
aws-smithy-runtime = { version = "1.1.1", default-features = false, features = ["client", "connector-hyper-0-14-x"] }
55-
hyper-rustls = { version = "0.24.2", features = ["http2", "webpki-roots", "webpki-tokio"] }
61+
aws-config = { version = "1.1.1", default-features = false, features = [
62+
"rt-tokio",
63+
"behavior-version-latest",
64+
] }
65+
aws-sdk-ec2 = { version = "1.13.0", default-features = false, features = [
66+
"rt-tokio",
67+
"behavior-version-latest",
68+
] }
69+
aws-sdk-ssm = { version = "1.7.0", default-features = false, features = [
70+
"rt-tokio",
71+
"behavior-version-latest",
72+
] }
73+
aws-smithy-runtime = { version = "1.1.1", default-features = false, features = [
74+
"client",
75+
"connector-hyper-0-14-x",
76+
] }
77+
hyper-rustls = { version = "0.24.2", features = [
78+
"http2",
79+
"webpki-roots",
80+
"webpki-tokio",
81+
] }
5682
itertools = "0.12.1"
5783
# opentelemetry = { version = "0.18.0", features = ["trace", "rt-tokio"] }
5884
# opentelemetry-otlp = { version = "0.11.0", features = ["tokio"] }

charts/chisel-operator/Chart.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ version: 0.1.0
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
2323
# It is recommended to use it with quotes.
24-
appVersion: "v0.4.0"
24+
appVersion: "v0.4.1"
25+

charts/chisel-operator/templates/serviceaccount.yaml

+10-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,18 @@ metadata:
2121
{{- toYaml . | nindent 4 }}
2222
{{- end }}
2323
rules:
24-
- apiGroups: ["*"]
24+
- apiGroups: ["apps"]
25+
resources: ["deployments", "deployments/*"]
26+
verbs: ["*"]
27+
- apiGroups: [""]
28+
resources: ["services", "services/status", "services/finalizers"]
29+
verbs: ["get", "list", "watch", "update", "patch"]
30+
- apiGroups: ["chisel-operator.io"]
2531
resources: ["*"]
2632
verbs: ["*"]
33+
- apiGroups: [""]
34+
resources: ["secrets"]
35+
verbs: ["get", "list", "create", "update", "patch", "delete"]
2736

2837
---
2938
apiVersion: rbac.authorization.k8s.io/v1

deploy/clusterrole.yaml

+10-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@ kind: ClusterRole
33
metadata:
44
name: chisel-operator
55
rules:
6-
- apiGroups: ["*"]
6+
- apiGroups: ["apps"]
7+
resources: ["deployments", "deployments/*"]
8+
verbs: ["*"]
9+
- apiGroups: [""]
10+
resources: ["services", "services/status", "services/finalizers"]
11+
verbs: ["get", "list", "watch", "update", "patch"]
12+
- apiGroups: ["chisel-operator.io"]
713
resources: ["*"]
814
verbs: ["*"]
15+
- apiGroups: [""]
16+
resources: ["secrets"]
17+
verbs: ["get", "list", "create", "update", "patch", "delete"]

deploy/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
automountServiceAccountToken: true
2020
containers:
2121
- name: chisel-operator
22-
image: ghcr.io/fyralabs/chisel-operator:v0.3.4
22+
image: ghcr.io/fyralabs/chisel-operator:v0.4.1
2323
env:
2424
- name: RUST_LOG
2525
value: "debug"

0 commit comments

Comments
 (0)