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.

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

ocp4_workload_fuse_online: clusterresourcequota name cannot contain underscore #3502

Merged
merged 1 commit into from
Mar 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
k8s:
state: present
definition: "{{ lookup('template', role_path ~ '/templates/clusterresourcequota.j2' ) | from_yaml }}"
vars:
clusterresourcequota_name: "{{ (ocp_username + '-' + guid) | replace('_','-') }}"
when: ocp4_workload_fuse_online_user_needs_quota | default(false) | bool

- name: pre_workload Tasks Complete
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
- name: remove user quota - clusterresourcequota
k8s:
state: absent
name: "clusterquota-{{ ocp_username }}-{{ guid }}"
name: "clusterquota-{{ (ocp_username + '-' + guid) | replace('_','-') }}"
kind: ClusterResourceQuota
api_version: quota.openshift.io/v1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
k8s:
state: present
namespace: "{{ ocp4_workload_fuse_online_project }}"
definition: "{{ lookup('template', 'image-pull-secret.yml.j2' ) | from_yaml }}"
definition: "{{ lookup('template', 'image-pull-secret.j2' ) | from_yaml }}"

- name: link secret to syndesis operator sa
shell: oc secrets link syndesis-operator registry-credentials --for=pull -n {{ ocp4_workload_fuse_online_project }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: quota.openshift.io/v1
kind: ClusterResourceQuota
metadata:
name: clusterquota-{{ ocp_username }}-{{ guid }}
name: clusterquota-{{ clusterresourcequota_name }}
labels:
workload: ocp-workload-fuse-ignite
spec:
Expand Down