Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/configurable clusterrole binding name #443

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix/configurable clusterrole binding name #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
85747fc
build(deps): bump golang.org/x/mod from 0.22.0 to 0.23.0
dependabot[bot] Feb 7, 2025
4bc19f9
build(deps): bump github.com/fluxcd/pkg/apis/meta from 1.6.1 to 1.10.0
dependabot[bot] Feb 3, 2025
a8f5732
go mod tidy
padraigmc Feb 7, 2025
3cd3277
expose clusterrolebinding name for fluxcd and kraan admin service acc…
padraigmc Feb 7, 2025
0a40840
Revert "build(deps): bump github.com/fluxcd/pkg/apis/meta from 1.6.1 …
padraigmc Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.3.45
v0.3.46
4 changes: 2 additions & 2 deletions chart/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
description: A Helm chart for kraan controller
name: kraan-controller
type: application
appVersion: v0.3.45
version: v0.3.45
appVersion: v0.3.46
version: v0.3.46
9 changes: 9 additions & 0 deletions chart/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,12 @@ Create chart name and version as used by the chart label.
{{- define "kraan-controller.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{- define "kraan-controller.gotk.adminClusterRoleBinding.name" -}}
{{ $crbName := .Values.gotk.rbac.adminClusterRoleBinding.name }}
{{- if eq $crbName "cluster-reconciler" -}}
{{ $crbName }}-{{ .Release.Namespace }}
{{- else -}}
{{ $crbName }}
{{- end -}}
{{- end -}}
2 changes: 1 addition & 1 deletion chart/templates/gotk/rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ metadata:
labels:
app.kubernetes.io/instance: "{{ .Release.Namespace }}"
app.kubernetes.io/version: latest
name: cluster-reconciler-{{.Release.Namespace}}
name: {{ template "kraan-controller.gotk.adminClusterRoleBinding.name" . }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/kraan/rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ subjects:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: kraan-deployer
name: {{ .Values.kraan.rbac.adminClusterRoleBinding.name }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down
4 changes: 4 additions & 0 deletions chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ kraan:
# specify rules to create a ClusterRole
# https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#policyrule-v1-rbac-authorization-k8s-io
rules: []
adminClusterRoleBinding:
name: "kraan-deployer"
netpolicy:
enabled: true
kraanController:
Expand Down Expand Up @@ -93,6 +95,8 @@ gotk:
# specify rules to create a ClusterRole
# https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#policyrule-v1-rbac-authorization-k8s-io
rules: []
adminClusterRoleBinding:
name: "cluster-reconciler"
netpolicy:
enabled: true

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.20.5
go.uber.org/zap v1.27.0
golang.org/x/mod v0.22.0
golang.org/x/mod v0.23.0
k8s.io/api v0.31.1
k8s.io/apiextensions-apiserver v0.31.1
k8s.io/apimachinery v0.31.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand Down
Loading