From 5c3035266d6f734a87621f8a27d97823d07842a7 Mon Sep 17 00:00:00 2001 From: "David J. M. Karlsen" Date: Mon, 29 Mar 2021 21:33:51 +0200 Subject: [PATCH] Upgrade operator sdk (#214) --- .github/workflows/build.yaml | 2 +- PROJECT | 8 ++++++-- config/manager/manager.yaml | 1 + config/rbac/auth_proxy_role_binding.yaml | 2 +- config/rbac/kustomization.yaml | 1 + config/rbac/leader_election_role_binding.yaml | 2 +- config/rbac/role_binding.yaml | 2 +- config/rbac/service_account.yaml | 5 +++++ 8 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 config/rbac/service_account.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9b30a380..3b9d7db5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,7 +8,7 @@ on: pull_request: env: KUBE_BUILDER_VERSION: "2.3.2" - OPERATOR_SDK_VERSION: "v1.4.2" + OPERATOR_SDK_VERSION: "v1.5.0" jobs: build: runs-on: ubuntu-latest diff --git a/PROJECT b/PROJECT index 8bce7018..96146104 100644 --- a/PROJECT +++ b/PROJECT @@ -3,9 +3,13 @@ layout: go.kubebuilder.io/v2 projectName: github-actions-runner-operator repo: github.com/evryfs/github-actions-runner-operator resources: -- group: garo +- + controller: true + domain: tietoevry.com + group: garo kind: GithubActionRunner + path: github.com/evryfs/github-actions-runner-operator/api/v1alpha1 version: v1alpha1 -version: 3-alpha +version: "3" plugins: go.operator-sdk.io/v2-alpha: {} diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 2f30f613..ccc51110 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -38,3 +38,4 @@ spec: cpu: 100m memory: 20Mi terminationGracePeriodSeconds: 10 + serviceAccountName: controller-manager diff --git a/config/rbac/auth_proxy_role_binding.yaml b/config/rbac/auth_proxy_role_binding.yaml index 48ed1e4b..ec7acc0a 100644 --- a/config/rbac/auth_proxy_role_binding.yaml +++ b/config/rbac/auth_proxy_role_binding.yaml @@ -8,5 +8,5 @@ roleRef: name: proxy-role subjects: - kind: ServiceAccount - name: default + name: controller-manager namespace: system diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml index 66c28338..27cb1d17 100644 --- a/config/rbac/kustomization.yaml +++ b/config/rbac/kustomization.yaml @@ -1,4 +1,5 @@ resources: +- service_account.yaml - role.yaml - role_binding.yaml - leader_election_role.yaml diff --git a/config/rbac/leader_election_role_binding.yaml b/config/rbac/leader_election_role_binding.yaml index eed16906..1d1321ed 100644 --- a/config/rbac/leader_election_role_binding.yaml +++ b/config/rbac/leader_election_role_binding.yaml @@ -8,5 +8,5 @@ roleRef: name: leader-election-role subjects: - kind: ServiceAccount - name: default + name: controller-manager namespace: system diff --git a/config/rbac/role_binding.yaml b/config/rbac/role_binding.yaml index 8f265870..2070ede4 100644 --- a/config/rbac/role_binding.yaml +++ b/config/rbac/role_binding.yaml @@ -8,5 +8,5 @@ roleRef: name: manager-role subjects: - kind: ServiceAccount - name: default + name: controller-manager namespace: system diff --git a/config/rbac/service_account.yaml b/config/rbac/service_account.yaml new file mode 100644 index 00000000..7cd6025b --- /dev/null +++ b/config/rbac/service_account.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: controller-manager + namespace: system