Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
Katka92 committed Dec 18, 2024
2 parents 07487f3 + 9e1d6f1 commit 3811c8e
Show file tree
Hide file tree
Showing 41 changed files with 5,455 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ resources:
- tiertemplate-appstudio-tenant-199961605-199961605.yaml
- tiertemplate-appstudio-tenant-2246724155-2246724155.yaml
- tiertemplate-appstudio-tenant-2313893948-2313893948.yaml
- tiertemplate-appstudio-tenant-234313038-234313038.yaml
- tiertemplate-appstudio-tenant-3815075241-3815075241.yaml
- tiertemplate-appstudio-tenant-4121561789-4121561789.yaml
- tiertemplate-appstudio-tenant-649666048-649666048.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
clusterResources:
templateRef: appstudio-clusterresources-593233715-593233715
namespaces:
- templateRef: appstudio-tenant-1361763024-1361763024
- templateRef: appstudio-tenant-234313038-234313038
spaceRoles:
admin:
templateRef: appstudio-admin-849337768-849337768
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,278 @@
# ----------------------------------------------------------------
# Generated by cli - DO NOT EDIT
# ----------------------------------------------------------------

apiVersion: toolchain.dev.openshift.com/v1alpha1
kind: TierTemplate
metadata:
name: appstudio-tenant-234313038-234313038
namespace: toolchain-host-operator
spec:
revision: 234313038-234313038
template:
apiVersion: template.openshift.io/v1
kind: Template
metadata: {}
objects:
- apiVersion: v1
kind: Namespace
metadata:
annotations:
openshift.io/description: ${SPACE_NAME}
openshift.io/display-name: ${SPACE_NAME}
openshift.io/requester: ${SPACE_NAME}
labels:
appstudio.redhat.com/workspace_name: ${SPACE_NAME}
argocd.argoproj.io/managed-by: gitops-service-argocd
name: ${SPACE_NAME}-tenant
name: ${SPACE_NAME}-tenant
- apiVersion: appstudio.redhat.com/v1alpha1
kind: Environment
metadata:
name: development
namespace: ${SPACE_NAME}-tenant
spec:
deploymentStrategy: AppStudioAutomated
displayName: Development
type: Non-POC
- apiVersion: v1
kind: ResourceQuota
metadata:
name: compute-build
namespace: ${SPACE_NAME}-tenant
spec:
hard:
limits.cpu: ${CPU_BUILD_LIMIT}
limits.memory: ${MEMORY_BUILD_LIMIT}
requests.cpu: ${CPU_BUILD_REQUEST}
requests.memory: ${MEMORY_BUILD_REQUEST}
scopes:
- Terminating
- apiVersion: v1
kind: ResourceQuota
metadata:
name: storage
namespace: ${SPACE_NAME}-tenant
spec:
hard:
count/persistentvolumeclaims: ${COUNT_PVC}
limits.ephemeral-storage: 50Gi
requests.ephemeral-storage: 50Gi
requests.storage: ${REQUEST_STORAGE}
- apiVersion: v1
kind: ResourceQuota
metadata:
name: toolchain-crds
namespace: ${SPACE_NAME}-tenant
spec:
hard:
count/spacerequests.toolchain.dev.openshift.com: "32"
- apiVersion: v1
kind: ResourceQuota
metadata:
name: appstudio-crds
namespace: ${SPACE_NAME}-tenant
spec:
hard:
count/applications.appstudio.redhat.com: ${COUNT_APPLICATION}
count/componentdetectionqueries.appstudio.redhat.com: "512"
count/components.appstudio.redhat.com: ${COUNT_COMPONENT}
- apiVersion: v1
kind: ResourceQuota
metadata:
name: appstudio-crds-build
namespace: ${SPACE_NAME}-tenant
spec:
hard:
count/buildpipelineselectors.appstudio.redhat.com: "512"
- apiVersion: v1
kind: ResourceQuota
metadata:
name: appstudio-crds-gitops
namespace: ${SPACE_NAME}-tenant
spec:
hard:
count/deploymenttargetclaims.appstudio.redhat.com: "32"
count/deploymenttargetclasses.appstudio.redhat.com: "32"
count/deploymenttargets.appstudio.redhat.com: "32"
count/environments.appstudio.redhat.com: "512"
count/promotionruns.appstudio.redhat.com: "512"
- apiVersion: v1
kind: ResourceQuota
metadata:
name: appstudio-crds-integration
namespace: ${SPACE_NAME}-tenant
spec:
hard:
count/integrationtestscenarios.appstudio.redhat.com: "512"
count/snapshotenvironmentbindings.appstudio.redhat.com: "512"
count/snapshots.appstudio.redhat.com: ${COUNT_SNAPSHOT}
- apiVersion: v1
kind: ResourceQuota
metadata:
name: appstudio-crds-release
namespace: ${SPACE_NAME}-tenant
spec:
hard:
count/internalrequests.appstudio.redhat.com: "4096"
count/releaseplanadmissions.appstudio.redhat.com: "512"
count/releaseplans.appstudio.redhat.com: "512"
count/releases.appstudio.redhat.com: ${COUNT_RELEASE}
count/releasestrategies.appstudio.redhat.com: "512"
- apiVersion: v1
kind: ResourceQuota
metadata:
name: appstudio-crds-enterprisecontract
namespace: ${SPACE_NAME}-tenant
spec:
hard:
count/enterprisecontractpolicies.appstudio.redhat.com: "512"
- apiVersion: v1
kind: LimitRange
metadata:
name: resource-limits
namespace: ${SPACE_NAME}-tenant
spec:
limits:
- default:
cpu: 2000m
memory: 2Gi
defaultRequest:
cpu: 100m
memory: 256Mi
type: Container
- apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: allow-same-namespace
namespace: ${SPACE_NAME}-tenant
spec:
ingress:
- from:
- podSelector: {}
podSelector: {}
- apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: allow-from-openshift-ingress
namespace: ${SPACE_NAME}-tenant
spec:
ingress:
- from:
- namespaceSelector:
matchLabels:
network.openshift.io/policy-group: ingress
podSelector: {}
policyTypes:
- Ingress
- apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: allow-from-openshift-monitoring
namespace: ${SPACE_NAME}-tenant
spec:
ingress:
- from:
- namespaceSelector:
matchLabels:
network.openshift.io/policy-group: monitoring
podSelector: {}
policyTypes:
- Ingress
- apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: allow-from-codeready-workspaces-operator
namespace: ${SPACE_NAME}-tenant
spec:
ingress:
- from:
- namespaceSelector:
matchLabels:
network.openshift.io/policy-group: codeready-workspaces
podSelector: {}
policyTypes:
- Ingress
- apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: allow-from-olm-namespaces
namespace: ${SPACE_NAME}-tenant
spec:
ingress:
- from:
- namespaceSelector:
matchLabels:
openshift.io/scc: anyuid
podSelector: {}
policyTypes:
- Ingress
- apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: allow-from-console-namespaces
namespace: ${SPACE_NAME}-tenant
spec:
ingress:
- from:
- namespaceSelector:
matchLabels:
network.openshift.io/policy-group: console
podSelector: {}
policyTypes:
- Ingress
- apiVersion: v1
kind: ServiceAccount
metadata:
name: appstudio-pipeline
namespace: ${SPACE_NAME}-tenant
- apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: appstudio-pipelines-runner-rolebinding
namespace: ${SPACE_NAME}-tenant
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: appstudio-pipelines-runner
subjects:
- kind: ServiceAccount
name: appstudio-pipeline
namespace: ${SPACE_NAME}-tenant
- apiVersion: v1
data: {}
kind: ConfigMap
metadata:
labels:
config.openshift.io/inject-trusted-cabundle: "true"
name: trusted-ca
namespace: ${SPACE_NAME}-tenant
parameters:
- name: SPACE_NAME
required: true
- name: MEMORY_LIMIT
value: 32Gi
- name: MEMORY_REQUEST
value: 32Gi
- name: CPU_BUILD_LIMIT
value: "120"
- name: CPU_BUILD_REQUEST
value: "60"
- name: MEMORY_BUILD_LIMIT
value: 128Gi
- name: MEMORY_BUILD_REQUEST
value: 64Gi
- name: COUNT_PVC
value: "90"
- name: REQUEST_STORAGE
value: 200Gi
- name: COUNT_APPLICATION
value: "512"
- name: COUNT_COMPONENT
value: "512"
- name: COUNT_RELEASE
value: "1024"
- name: COUNT_SNAPSHOT
value: "1024"
tierName: appstudio
type: tenant
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,22 @@ resources:
- tiertemplate-appstudiolarge-admin-1893065526-849337768.yaml
- tiertemplate-appstudiolarge-admin-1929014883-1876853981.yaml
- tiertemplate-appstudiolarge-admin-1929014883-849337768.yaml
- tiertemplate-appstudiolarge-admin-3738936794-849337768.yaml
- tiertemplate-appstudiolarge-admin-3971529334-849337768.yaml
- tiertemplate-appstudiolarge-admin-3994678728-849337768.yaml
- tiertemplate-appstudiolarge-clusterresources-130270397-593233715.yaml
- tiertemplate-appstudiolarge-clusterresources-1884308846-809836689.yaml
- tiertemplate-appstudiolarge-clusterresources-1893065526-593233715.yaml
- tiertemplate-appstudiolarge-clusterresources-1929014883-3180033938.yaml
- tiertemplate-appstudiolarge-clusterresources-3738936794-593233715.yaml
- tiertemplate-appstudiolarge-clusterresources-3971529334-593233715.yaml
- tiertemplate-appstudiolarge-clusterresources-3994678728-3180033938.yaml
- tiertemplate-appstudiolarge-contributor-130270397-829105171.yaml
- tiertemplate-appstudiolarge-contributor-1884308846-1817914940.yaml
- tiertemplate-appstudiolarge-contributor-1893065526-829105171.yaml
- tiertemplate-appstudiolarge-contributor-1929014883-1817914940.yaml
- tiertemplate-appstudiolarge-contributor-1929014883-829105171.yaml
- tiertemplate-appstudiolarge-contributor-3738936794-829105171.yaml
- tiertemplate-appstudiolarge-contributor-3971529334-829105171.yaml
- tiertemplate-appstudiolarge-contributor-3994678728-829105171.yaml
- tiertemplate-appstudiolarge-maintainer-130270397-474752551.yaml
Expand All @@ -33,6 +36,7 @@ resources:
- tiertemplate-appstudiolarge-maintainer-1893065526-474752551.yaml
- tiertemplate-appstudiolarge-maintainer-1929014883-1904354742.yaml
- tiertemplate-appstudiolarge-maintainer-1929014883-293087644.yaml
- tiertemplate-appstudiolarge-maintainer-3738936794-341231795.yaml
- tiertemplate-appstudiolarge-maintainer-3971529334-474752551.yaml
- tiertemplate-appstudiolarge-maintainer-3994678728-1904354742.yaml
- tiertemplate-appstudiolarge-maintainer-3994678728-474752551.yaml
Expand All @@ -42,6 +46,7 @@ resources:
- tiertemplate-appstudiolarge-tenant-1893065526-1361763024.yaml
- tiertemplate-appstudiolarge-tenant-1929014883-3815075241.yaml
- tiertemplate-appstudiolarge-tenant-1929014883-649666048.yaml
- tiertemplate-appstudiolarge-tenant-3738936794-234313038.yaml
- tiertemplate-appstudiolarge-tenant-3971529334-4121561789.yaml
- tiertemplate-appstudiolarge-tenant-3994678728-4121561789.yaml
- tiertemplate-appstudiolarge-tenant-3994678728-649666048.yaml
Expand All @@ -50,5 +55,6 @@ resources:
- tiertemplate-appstudiolarge-viewer-1893065526-4256863455.yaml
- tiertemplate-appstudiolarge-viewer-1929014883-4059797645.yaml
- tiertemplate-appstudiolarge-viewer-1929014883-4256863455.yaml
- tiertemplate-appstudiolarge-viewer-3738936794-4256863455.yaml
- tiertemplate-appstudiolarge-viewer-3971529334-4256863455.yaml
- tiertemplate-appstudiolarge-viewer-3994678728-4256863455.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ metadata:
namespace: toolchain-host-operator
spec:
clusterResources:
templateRef: appstudiolarge-clusterresources-1893065526-593233715
templateRef: appstudiolarge-clusterresources-3738936794-593233715
namespaces:
- templateRef: appstudiolarge-tenant-1893065526-1361763024
- templateRef: appstudiolarge-tenant-3738936794-234313038
spaceRoles:
admin:
templateRef: appstudiolarge-admin-1893065526-849337768
templateRef: appstudiolarge-admin-3738936794-849337768
contributor:
templateRef: appstudiolarge-contributor-1893065526-829105171
templateRef: appstudiolarge-contributor-3738936794-829105171
maintainer:
templateRef: appstudiolarge-maintainer-1893065526-341231795
templateRef: appstudiolarge-maintainer-3738936794-341231795
viewer:
templateRef: appstudiolarge-viewer-1893065526-4256863455
templateRef: appstudiolarge-viewer-3738936794-4256863455
status: {}
Loading

0 comments on commit 3811c8e

Please sign in to comment.