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

Parametrize ipa namespace #141

Merged
merged 1 commit into from
Aug 5, 2022
Merged

Parametrize ipa namespace #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 5 additions & 6 deletions tooling/charts/tl500-base/templates/tl500-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,13 @@ subjects:
kind: Group
name: {{ .Values.group_name }}
---
# to view tl500 IPA namespaces
# Only if IPA namespace is there
{{ if (lookup "v1" "Namespace" "" "ipa") }}
{{- if .Values.ipa_namespace -}}
# to view tl500 IPA namespaces. Only if IPA namespace exists.
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: tl500-ipa-view
namespace: ipa
namespace: {{ .Values.ipa_namespace }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -135,7 +134,7 @@ subjects:
- apiGroup: rbac.authorization.k8s.io
kind: Group
name: {{ .Values.group_name }}
{{- end }}
{{- end -}}
---
# to edit/view monotoring
apiVersion: rbac.authorization.k8s.io/v1
Expand Down Expand Up @@ -163,4 +162,4 @@ subjects:
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: 'system:image-puller'
name: 'system:image-puller'
8 changes: 4 additions & 4 deletions tooling/charts/tl500-base/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ gitlab_app_name: "gitlab-ce"
# Create a helper to create a prefix if one isn't provided? Would help if we moved to shared clusters
prefix: ""

# Group name in LDAP / IdM (FreeIPA) for attendees
# Group name in LDAP / IdM (FreeIPA) for attendees.
group_name: student

# Namespace where IDM runs, in case is deployed in OCP. Otherwise leave it empty or blank.
ipa_namespace: ipa

namespaces:
- name: tl500-workspaces
Expand Down Expand Up @@ -75,7 +77,6 @@ operators:
operatorgroup:
create: false


logging:
# Might be needed with clusters that have an infra plane
# nodeSelector:
Expand Down Expand Up @@ -134,5 +135,4 @@ gitops-operator:
ignoreHelmHooks: false

tl500-teamsters:
enabled: true

enabled: true