diff --git a/components/application-api/allow-argocd-to-manage.yaml b/components/application-api/allow-argocd-to-manage.yaml deleted file mode 100644 index eaf581ef144..00000000000 --- a/components/application-api/allow-argocd-to-manage.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: grant-argocd - namespace: application-api -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: admin -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops - \ No newline at end of file diff --git a/components/application-api/argocd-permissions.yaml b/components/application-api/argocd-permissions.yaml deleted file mode 100644 index fb523f3f8a7..00000000000 --- a/components/application-api/argocd-permissions.yaml +++ /dev/null @@ -1,28 +0,0 @@ -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: crd-manager-for-application-api -rules: - - verbs: - - patch - - get - - list - - create - - get - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grant-argocd-crd-permissions-for-application-api -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: crd-manager-for-application-api -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: application-api diff --git a/components/application-api/kustomization.yaml b/components/application-api/kustomization.yaml index b3f649ebeb0..b46dfcb9af3 100644 --- a/components/application-api/kustomization.yaml +++ b/components/application-api/kustomization.yaml @@ -1,6 +1,4 @@ resources: -- allow-argocd-to-manage.yaml -- argocd-permissions.yaml - https://github.com/konflux-ci/application-api/config/crd?ref=e7eb2ecfb4090e53cffbfcd9308ff40ff4b6772e diff --git a/components/build-service/base/allow-argocd-to-manage.yaml b/components/build-service/base/allow-argocd-to-manage.yaml deleted file mode 100644 index 0f2f640429c..00000000000 --- a/components/build-service/base/allow-argocd-to-manage.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: grant-argocd - namespace: build-service -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: admin -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops diff --git a/components/build-service/base/kustomization.yaml b/components/build-service/base/kustomization.yaml index 132be9853c1..0726a456540 100644 --- a/components/build-service/base/kustomization.yaml +++ b/components/build-service/base/kustomization.yaml @@ -1,5 +1,4 @@ resources: -- allow-argocd-to-manage.yaml - build-pipeline-config/build-pipeline-config.yaml - monitoring.yaml - rbac diff --git a/components/has/base/argocd-roles/allow-argocd-to-manage.yaml b/components/has/base/argocd-roles/allow-argocd-to-manage.yaml deleted file mode 100644 index 97092e1d8a8..00000000000 --- a/components/has/base/argocd-roles/allow-argocd-to-manage.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: grant-argocd - namespace: application-service -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: admin -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops \ No newline at end of file diff --git a/components/has/base/argocd-roles/argocd-permissions.yaml b/components/has/base/argocd-roles/argocd-permissions.yaml deleted file mode 100644 index b9651fbebf0..00000000000 --- a/components/has/base/argocd-roles/argocd-permissions.yaml +++ /dev/null @@ -1,29 +0,0 @@ - -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: crd-manager-for-has -rules: - - verbs: - - patch - - get - - list - - create - - get - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grant-argocd-crd-permissions-for-has -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: crd-manager-for-has -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops diff --git a/components/has/base/argocd-roles/kustomization.yaml b/components/has/base/argocd-roles/kustomization.yaml deleted file mode 100644 index ae322189569..00000000000 --- a/components/has/base/argocd-roles/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - allow-argocd-to-manage.yaml - - argocd-permissions.yaml \ No newline at end of file diff --git a/components/has/base/kustomization.yaml b/components/has/base/kustomization.yaml index 841d3a531b8..d8497a24fba 100644 --- a/components/has/base/kustomization.yaml +++ b/components/has/base/kustomization.yaml @@ -1,7 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ./argocd-roles - ./rbac - https://github.com/redhat-appstudio/application-service/config/default?ref=338ad7f4e3577aa7c9b5be293a97689d84a28442 diff --git a/components/has/production/kustomization.yaml b/components/has/production/kustomization.yaml index 95a21944610..3dc799a8fe1 100644 --- a/components/has/production/kustomization.yaml +++ b/components/has/production/kustomization.yaml @@ -1,7 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../base/argocd-roles - ../base/external-secrets - ../base/rbac - https://github.com/redhat-appstudio/application-service/config/default?ref=338ad7f4e3577aa7c9b5be293a97689d84a28442 diff --git a/components/image-controller/base/allow-argocd-to-manage.yaml b/components/image-controller/base/allow-argocd-to-manage.yaml deleted file mode 100644 index 67af5ada29c..00000000000 --- a/components/image-controller/base/allow-argocd-to-manage.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: grant-argocd - namespace: image-controller -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: admin -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops \ No newline at end of file diff --git a/components/image-controller/base/kustomization.yaml b/components/image-controller/base/kustomization.yaml index 773df1551cc..5de24d592bb 100644 --- a/components/image-controller/base/kustomization.yaml +++ b/components/image-controller/base/kustomization.yaml @@ -1,5 +1,4 @@ resources: -- allow-argocd-to-manage.yaml - monitoring.yaml - rbac diff --git a/components/integration/base/allow-argocd-to-manage.yaml b/components/integration/base/allow-argocd-to-manage.yaml deleted file mode 100644 index d283acd888d..00000000000 --- a/components/integration/base/allow-argocd-to-manage.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: grant-argocd - namespace: integration-service -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: admin -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops diff --git a/components/integration/base/argocd-permissions.yaml b/components/integration/base/argocd-permissions.yaml deleted file mode 100644 index af52e26a33f..00000000000 --- a/components/integration/base/argocd-permissions.yaml +++ /dev/null @@ -1,28 +0,0 @@ -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: crd-manager-for-integration -rules: - - verbs: - - patch - - get - - list - - create - - get - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grant-argocd-crd-permissions-for-integration -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: crd-manager-for-integration -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops diff --git a/components/integration/base/kustomization.yaml b/components/integration/base/kustomization.yaml index 1af783abd16..81edfb1ae1d 100644 --- a/components/integration/base/kustomization.yaml +++ b/components/integration/base/kustomization.yaml @@ -1,6 +1,4 @@ resources: -- allow-argocd-to-manage.yaml -- argocd-permissions.yaml - delete-snapshots.yaml - manage-integrationtestscenarios.yaml - integration.yaml diff --git a/components/jvm-build-service/base/allow-argocd-to-manage.yaml b/components/jvm-build-service/base/allow-argocd-to-manage.yaml deleted file mode 100644 index 6cea787426a..00000000000 --- a/components/jvm-build-service/base/allow-argocd-to-manage.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: grant-argocd -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: admin -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops diff --git a/components/jvm-build-service/base/kustomization.yaml b/components/jvm-build-service/base/kustomization.yaml index f6fa2f89e27..102ade52e6c 100644 --- a/components/jvm-build-service/base/kustomization.yaml +++ b/components/jvm-build-service/base/kustomization.yaml @@ -1,5 +1,4 @@ resources: -- allow-argocd-to-manage.yaml - https://github.com/redhat-appstudio/jvm-build-service/deploy/crds/base?ref=cac2c46771e4ce11554e7032b90aab221d928645 - https://github.com/redhat-appstudio/jvm-build-service/deploy/operator/base?ref=cac2c46771e4ce11554e7032b90aab221d928645 - https://github.com/redhat-appstudio/jvm-build-service/deploy/operator/config?ref=cac2c46771e4ce11554e7032b90aab221d928645 diff --git a/components/multi-platform-controller/base/common/allow-argocd-to-manage.yaml b/components/multi-platform-controller/base/common/allow-argocd-to-manage.yaml deleted file mode 100644 index 8fd4e8be4a2..00000000000 --- a/components/multi-platform-controller/base/common/allow-argocd-to-manage.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: grant-argocd - namespace: multi-platform-controller -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: admin -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops diff --git a/components/multi-platform-controller/base/common/kustomization.yaml b/components/multi-platform-controller/base/common/kustomization.yaml index d540fe9e6a0..324754053f1 100644 --- a/components/multi-platform-controller/base/common/kustomization.yaml +++ b/components/multi-platform-controller/base/common/kustomization.yaml @@ -2,4 +2,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - monitoring.yaml -- allow-argocd-to-manage.yaml diff --git a/components/project-controller/base/allow-argocd-to-manage.yaml b/components/project-controller/base/allow-argocd-to-manage.yaml deleted file mode 100644 index 5e7f848cf56..00000000000 --- a/components/project-controller/base/allow-argocd-to-manage.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: grant-argocd - namespace: project-controller -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: admin -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops diff --git a/components/project-controller/base/argocd-permissions.yaml b/components/project-controller/base/argocd-permissions.yaml deleted file mode 100644 index aeabedc8d4c..00000000000 --- a/components/project-controller/base/argocd-permissions.yaml +++ /dev/null @@ -1,28 +0,0 @@ -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: crd-manager-for-project-controller -rules: - - verbs: - - patch - - get - - list - - create - - get - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grant-argocd-crd-permissions-for-project-controller -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: crd-manager-for-project-controller -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops diff --git a/components/project-controller/base/kustomization.yaml b/components/project-controller/base/kustomization.yaml index 3cba52edf3b..d5003974808 100644 --- a/components/project-controller/base/kustomization.yaml +++ b/components/project-controller/base/kustomization.yaml @@ -3,7 +3,5 @@ kind: Kustomization resources: - project-controller.yaml -- allow-argocd-to-manage.yaml -- argocd-permissions.yaml namespace: project-controller diff --git a/components/release/base/allow-argocd-to-manage.yaml b/components/release/base/allow-argocd-to-manage.yaml deleted file mode 100644 index 99b75d8e4b5..00000000000 --- a/components/release/base/allow-argocd-to-manage.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: grant-argocd - namespace: release-service -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: admin -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops diff --git a/components/release/base/argocd-permissions.yaml b/components/release/base/argocd-permissions.yaml deleted file mode 100644 index d9889702402..00000000000 --- a/components/release/base/argocd-permissions.yaml +++ /dev/null @@ -1,29 +0,0 @@ - -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: crd-manager-for-release -rules: - - verbs: - - patch - - get - - list - - create - - get - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: grant-argocd-crd-permissions-for-release -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: crd-manager-for-release -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops diff --git a/components/release/base/kustomization.yaml b/components/release/base/kustomization.yaml index 3313e531db0..17d9fd40295 100644 --- a/components/release/base/kustomization.yaml +++ b/components/release/base/kustomization.yaml @@ -1,6 +1,4 @@ resources: -- allow-argocd-to-manage.yaml -- argocd-permissions.yaml - release-pipeline-resources-clusterrole.yaml - release-service-config-rbac.yaml - release-service-configurator-role.yaml