Skip to content

chore: add resource definitions for cluster orchestration elements #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions argocd/applications/custom/capi-operator.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ env:
value: "{{ .Values.argo.proxy.noProxy }}"
{{- end }}
{{- end }}
{{- with .Values.argo.resources.capiOperator }}
resources:
manager:
{{- toYaml . | nindent 4 }}
{{- end }}
manager:
featureGates:
core:
Expand Down
8 changes: 8 additions & 0 deletions argocd/applications/custom/cluster-connect-gateway.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

fullnameOverride: cluster-connect-gateway
gateway:
{{- with .Values.argo.resources.clusterConnectGateway.gateway }}
resources:
{{- toYaml . | nindent 4 }}
{{- end }}
externalUrl: "wss://connect-gateway.{{ .Values.argo.clusterDomain }}:443"
ingress:
enabled: true
Expand All @@ -15,6 +19,10 @@ agent:
tlsMode: system-store

controller:
{{- with .Values.argo.resources.clusterConnectGateway.controller }}
resources:
{{- toYaml . | nindent 4 }}
{{- end }}
privateCA:
enabled: true

Expand Down
10 changes: 9 additions & 1 deletion argocd/applications/custom/cluster-manager.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ clusterManager:
{{- with .Values.argo.imagePullSecrets }}
{{- toYaml . | nindent 6 }}
{{- end }}
{{- with .Values.argo.resources.clusterManager.clusterManager }}
resources:
{{- toYaml . | nindent 4 }}
{{- end }}
templateController:
image:
repository: cluster/template-controller
Expand All @@ -21,4 +25,8 @@ templateController:
imagePullSecrets:
{{- with .Values.argo.imagePullSecrets }}
{{- toYaml . | nindent 6 }}
{{- end }}
{{- end }}
{{- with .Values.argo.resources.clusterManager.templateController }}
resources:
{{- toYaml . | nindent 4 }}
{{- end }}
11 changes: 10 additions & 1 deletion argocd/applications/custom/intel-infra-provider.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,17 @@ manager:
registry:
name: {{ .Values.argo.containerRegistryURL }}
repository: cluster/capi-provider-intel-manager
{{- with .Values.argo.resources.intelInfraProvider.manager }}
resources:
{{- toYaml . | nindent 4 }}
{{- end }}

southboundApi:
image:
registry:
name: {{ .Values.argo.containerRegistryURL }}
repository: cluster/capi-provider-intel-southbound
repository: cluster/capi-provider-intel-southbound
{{- with .Values.argo.resources.intelInfraProvider.southboundApi }}
resources:
{{- toYaml . | nindent 4 }}
{{- end }}
47 changes: 46 additions & 1 deletion orch-configs/profiles/resource-default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,58 @@ argo:
limits:
cpu: "64"
memory: "64Gi"
clusterOrchestratorWaitCtm:
capiOperator:
requests:
cpu: "1m"
memory: "1Mi"
limits:
cpu: "64"
memory: "64Gi"
clusterConnectGateway:
gateway:
requests:
cpu: "1m"
memory: "1Mi"
limits:
cpu: "64"
memory: "64Gi"
controller:
requests:
cpu: "1m"
memory: "1Mi"
limits:
cpu: "64"
memory: "64Gi"
clusterManager:
clusterManager:
requests:
cpu: "1m"
memory: "1Mi"
limits:
cpu: "64"
memory: "64Gi"
templateController:
requests:
cpu: "1m"
memory: "1Mi"
limits:
cpu: "64"
memory: "64Gi"
intelInfraProvider:
manager:
requests:
cpu: "1m"
memory: "1Mi"
limits:
cpu: "64"
memory: "64Gi"
southboundApi:
requests:
cpu: "1m"
memory: "1Mi"
limits:
cpu: "64"
memory: "64Gi"
configProvisioner:
requests:
cpu: "1m"
Expand Down
20 changes: 15 additions & 5 deletions tools/resource-limit/mapping.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,22 @@ orch-app:
orch-boots:
ingress-nginx-controller:
controller: "argo.resources.ingressNginx.controller.root"
capi-operator-system:
capi-operator-cluster-api-operator:
manager: "argo.resources.capiOperator"
orch-cluster:
# TODO: replace with new cluster-orch stack (cm + capi)
# Resource managed by VPA/HPA
# orch-database:
# postgresql:
# postgresql: "argo.resources.postgresql"
cluster-manager:
cluster-manager: "argo.resources.clusterManager.clusterManager"
cluster-manager-template-controller:
template-controller: "argo.resources.clusterManager.templateManager"
cluster-connect-gateway-controller:
connect-controller: "argo.resources.clusterConnectGateway.controller"
cluster-connect-gateway-gateway:
connect-gateway: "argo.resources.clusterConnectGateway.gateway"
intel-infra-provider-manager:
intel-infra-provider-manager: "argo.resources.intelInfraProvider.manager"
intel-infra-provider-southbound:
intel-infra-provider-southbound: "argo.resources.intelInfraProvider.southboundApi"
orch-gateway:
auth-service:
auth-service: "argo.resources.authService"
Expand Down