Skip to content

Commit e6d1959

Browse files
committed
chore: use nested kustomization files internal-services
This commit updates the internal-services directory to use nested kustomization files instead of pointing directly at each yaml file. This is a little less error prone, as if you add a new file to a directory, you don't have to worry about also updating the kustomization.yaml file. Signed-off-by: Johnny Bieren <[email protected]>
1 parent 6d00456 commit e6d1959

File tree

10 files changed

+70
-31
lines changed

10 files changed

+70
-31
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
4+
resources:
5+
- appstudio.redhat.com_internalrequests.yaml
6+
- appstudio.redhat.com_internalservicesconfigs.yaml
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
4+
resources:
5+
- cleanup-internal-requests-pipelineruns.yaml
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
4+
resources:
5+
- secret-store.yaml
6+
- secret-id.yaml

components/internal-services/base/kustomization.yaml

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,10 @@ kind: Kustomization
33

44
resources:
55
# Custom Resource Definitions
6-
- crds/appstudio.redhat.com_internalrequests.yaml
7-
- crds/appstudio.redhat.com_internalservicesconfigs.yaml
6+
- crds/
87
# External Secrets Resources
9-
- eso/secret-store.yaml
10-
- eso/secret-id.yaml
8+
- eso/
119
# RBAC Resources
12-
- rbac/service_account.yaml
13-
- rbac/role.yaml
14-
- rbac/role_binding.yaml
15-
- rbac/leader_election_role.yaml
16-
- rbac/leader_election_role_binding.yaml
17-
- rbac/auth_proxy_client_clusterrole.yaml
18-
- rbac/auth_proxy_role.yaml
19-
- rbac/auth_proxy_role_binding.yaml
20-
- rbac/auth_proxy_service.yaml
21-
- rbac/internalrequest_editor_role.yaml
22-
- rbac/internalrequest_viewer_role.yaml
23-
- rbac/internalservicesconfig_editor_role.yaml
24-
- rbac/internalservicesconfig_viewer_role.yaml
25-
10+
- rbac/
2611
# CronJob Resources
27-
- cronjob/cleanup-internal-requests-pipelineruns.yaml
12+
- cronjob/
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
4+
resources:
5+
- service_account.yaml
6+
- role.yaml
7+
- role_binding.yaml
8+
- leader_election_role.yaml
9+
- leader_election_role_binding.yaml
10+
- auth_proxy_client_clusterrole.yaml
11+
- auth_proxy_role.yaml
12+
- auth_proxy_role_binding.yaml
13+
- auth_proxy_service.yaml
14+
- internalrequest_editor_role.yaml
15+
- internalrequest_viewer_role.yaml
16+
- internalservicesconfig_editor_role.yaml
17+
- internalservicesconfig_viewer_role.yaml
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
resources:
5+
- internal-services-config.yaml

components/internal-services/internal-staging/kustomization.yaml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,16 @@ resources:
66
- ../base
77

88
# Manager deployments for staging
9-
- manager/manager-staging-p01.yaml
10-
- manager/manager-staging-rh01.yaml
9+
- manager/
1110

1211
# Network Policy
13-
- networkpolicy/network_policy.yaml
12+
- networkpolicy/
1413

15-
# Configuration
16-
- config/internal-services-config.yaml
14+
# InternalServicesConfig
15+
- config/
1716

1817
# External Secrets
19-
- es/es.yaml
18+
- es/
2019

2120
# Signing configurations
22-
- signing/hacbs-signing-pipeline-config-openshifthosted.yaml
23-
- signing/hacbs-signing-pipeline-config-redhatbeta2.yaml
24-
- signing/hacbs-signing-pipeline-config-redhatrelease2.yaml
25-
- signing/hacbs-signing-pipeline-config-staging-openshifthosted.yaml
26-
- signing/hacbs-signing-pipeline-config-staging-redhatbeta2.yaml
27-
- signing/hacbs-signing-pipeline-config-staging-redhatrelease2.yaml
21+
- signing/
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
resources:
5+
- manager-staging-p01.yaml
6+
- manager-staging-rh01.yaml
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
resources:
5+
- network_policy.yaml
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
resources:
5+
- hacbs-signing-pipeline-config-openshifthosted.yaml
6+
- hacbs-signing-pipeline-config-redhatbeta2.yaml
7+
- hacbs-signing-pipeline-config-redhatrelease2.yaml
8+
- hacbs-signing-pipeline-config-staging-openshifthosted.yaml
9+
- hacbs-signing-pipeline-config-staging-redhatbeta2.yaml
10+
- hacbs-signing-pipeline-config-staging-redhatrelease2.yaml

0 commit comments

Comments
 (0)