Skip to content

Commit

Permalink
Merge pull request #23 from RedHatGov/develop
Browse files Browse the repository at this point in the history
Merging develop into main
  • Loading branch information
roller1187 authored Oct 20, 2020
2 parents fb61f31 + ca7b8c8 commit 89457f2
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 15 deletions.
1 change: 1 addition & 0 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ spec:
- "--leader-election-id=gitea-operator"
image: controller:latest
terminationGracePeriodSeconds: 10
serviceAccountName: gitea-operator-sa
3 changes: 1 addition & 2 deletions config/rbac/cluster_role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ roleRef:
name: manager-role
subjects:
- kind: ServiceAccount
name: default
namespace: system
name: sa
1 change: 1 addition & 0 deletions config/rbac/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ resources:
- leader_election_role_binding.yaml
- gitea_editor_role.yaml
- gitea_viewer_role.yaml
- service_account.yaml
3 changes: 1 addition & 2 deletions config/rbac/leader_election_role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ roleRef:
name: leader-election-role
subjects:
- kind: ServiceAccount
name: default
namespace: system
name: sa
1 change: 1 addition & 0 deletions config/rbac/namespaced/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ resources:
- ../leader_election_role_binding.yaml
- ../gitea_editor_role.yaml
- ../gitea_viewer_role.yaml
- ../service_account.yaml
3 changes: 1 addition & 2 deletions config/rbac/namespaced/role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ roleRef:
name: manager-role
subjects:
- kind: ServiceAccount
name: default
namespace: system
name: sa
5 changes: 5 additions & 0 deletions config/rbac/service_account.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: sa
4 changes: 2 additions & 2 deletions config/testing/cluster_scope/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ resources:
- ../../rbac
- ../../manager

namespace: osdk-test
namePrefix: osdk-
namespace: gitea-operator-test
namePrefix: gitea-operator-

images:
- name: testing
Expand Down
4 changes: 2 additions & 2 deletions config/testing/namespace_scope/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ resources:
- ../../rbac/namespaced
- ../../manager

namespace: osdk-test
namePrefix: osdk-
namespace: gitea-operator-test
namePrefix: gitea-operator-

images:
- name: testing
Expand Down
10 changes: 5 additions & 5 deletions roles/gitea-ocp/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
namespace: "{{ _gitea_namespace }}"
register: r_route
until:
- (r_route.resources|length) > 0
- r_route.resources[0].spec.host is defined
- r_route.resources[0].spec.host|length > 0
- (r_route.resources|length) > 0
- r_route.resources[0].spec.host is defined
- r_route.resources[0].spec.host|length > 0

- name: Store Gitea Route Hostname
when:
Expand All @@ -64,8 +64,8 @@

- name: Wait until application is available
when:
- _gitea_state == "present"
- _gitea_wait_for_init|bool
- _gitea_state == "present"
- _gitea_wait_for_init|bool
k8s_facts:
api_version: apps/v1
kind: Deployment
Expand Down

0 comments on commit 89457f2

Please sign in to comment.