Skip to content

*: limit HyperShift cluster sizes in dev #3876

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.

Sign up for GitHub

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

Open
stevekuznetsov wants to merge 4 commits into
base: main
Choose a base branch
from
Open

*: limit HyperShift cluster sizes in dev #3876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a777142
*: limit HyperShift cluster sizes in dev
stevekuznetsov Jan 23, 2026
404b710
config: add more nodes to inital prow clusters
stevekuznetsov Jan 24, 2026
0dabf3f
istio
stevekuznetsov Jan 24, 2026
b1d7db6
test: try 10 in parallel for e2e
stevekuznetsov Jan 24, 2026
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
3 changes: 3 additions & 0 deletions config/config.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2109,6 +2109,9 @@
"FirstPartyUsage=/NonProd",
""
]
},
"limitClusterSizes": {
"type": "boolean"
}
},
"additionalProperties": false,
Expand Down
6 changes: 4 additions & 2 deletions config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,6 +942,7 @@ clouds:
minVersion: 4.19.0-0.nightly-20200101
# Hypershift Operator
hypershift:
limitClusterSizes: true
image:
registry: quay.io
repository: redhat-services-prod/crt-redhat-acm-tenant/hypershift/hypershift-operator
Expand Down Expand Up @@ -992,8 +993,8 @@ clouds:
nsp:
accessMode: 'Learning'
istio:
targetVersion: "asm-1-25"
versions: "asm-1-25"
targetVersion: "asm-1-26"
versions: "asm-1-26"
aks:
etcd:
softDelete: false
Expand Down Expand Up @@ -1420,6 +1421,7 @@ clouds:
vmSize: Standard_D2s_v3
userAgentPool:
maxCount: 14
minCount: 4
osDiskSizeGB: 100
vmSize: Standard_D4s_v3
infraAgentPool:
Expand Down
12 changes: 6 additions & 6 deletions config/dev.digests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ clouds:
environments:
cspr:
regions:
westus3: b7dba8105a51d503c1a0ccf070261f37b6656119d6bb2ffbf7e1b1f7e201b3b6
westus3: e7457021b1de24226512f449fb70f120a5583cdea1e1832fed91b6765365a798
dev:
regions:
westus3: 4322e33979adbefe7359bc517760860c71091073806fd02c2bd03a8e4025f43f
westus3: 4fb1b106b387342ae46f783f199d533cb5077fbc4d0c45ee8f24ebf374f46144
perf:
regions:
westus3: a9997a5fb839e12fd784d73e4a6bdeb2d5452b427a0b0d29469c94c712d6f565
westus3: 92e1871d681b68c652c55b1367845c8a5065139ae84cbbac485113bd3b584f76
pers:
regions:
westus3: 648f9eb2e86218f8f7e3d3cd5a7179b8cc51f5237bbe45c17adece272ec8237f
westus3: b1e92a05420dd0b8b4d8f51ed5ff94e8bf6668c3e06ffc311cc4ffad8f6fd0a0
prow:
regions:
westus3: 5b58e748efb966e8fd8fcb4f2df3ffc8794146d5ae594d53cbe5c57e0f492aa7
westus3: 3c7d44228434a9c9441049a5088751cac4ff4f6447e653d5792afc9f5202661d
swft:
regions:
uksouth: bbaae11d4883995fbd2618e7c98e96734409bb84d0e3d0e3aaf618bd66642b5e
uksouth: de552e830f6fe42f28a05f5d0dcd65e4217d9f28f67eebe8604a38f06a8b7c49
5 changes: 3 additions & 2 deletions config/rendered/dev/cspr/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ hypershift:
digest: sha256:35f451ffdb9ef4fc0ad24b0d11521dc4f6e053a63ba0d884dd6de0d03d2d547d
registry: quay.io
repository: redhat-services-prod/crt-redhat-acm-tenant/hypershift/hypershift-operator
limitClusterSizes: true
namespace: hypershift
sharedIngressIPTag: ""
imageSync:
Expand Down Expand Up @@ -751,8 +752,8 @@ svc:
ingressGatewayIPAddressName: aro-hcp-istio-ingress
istioctlVersion: 1.24.1
tag: prod-stable
targetVersion: asm-1-25
versions: asm-1-25
targetVersion: asm-1-26
versions: asm-1-26
nsp:
accessMode: Learning
name: nsp-usw3-svc
Expand Down
5 changes: 3 additions & 2 deletions config/rendered/dev/dev/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ hypershift:
digest: sha256:35f451ffdb9ef4fc0ad24b0d11521dc4f6e053a63ba0d884dd6de0d03d2d547d
registry: quay.io
repository: redhat-services-prod/crt-redhat-acm-tenant/hypershift/hypershift-operator
limitClusterSizes: true
namespace: hypershift
sharedIngressIPTag: ""
imageSync:
Expand Down Expand Up @@ -751,8 +752,8 @@ svc:
ingressGatewayIPAddressName: aro-hcp-istio-ingress
istioctlVersion: 1.24.1
tag: prod-stable
targetVersion: asm-1-25
versions: asm-1-25
targetVersion: asm-1-26
versions: asm-1-26
nsp:
accessMode: Learning
name: nsp-usw3-svc
Expand Down
5 changes: 3 additions & 2 deletions config/rendered/dev/perf/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ hypershift:
digest: sha256:35f451ffdb9ef4fc0ad24b0d11521dc4f6e053a63ba0d884dd6de0d03d2d547d
registry: quay.io
repository: redhat-services-prod/crt-redhat-acm-tenant/hypershift/hypershift-operator
limitClusterSizes: true
namespace: hypershift
sharedIngressIPTag: ""
imageSync:
Expand Down Expand Up @@ -751,8 +752,8 @@ svc:
ingressGatewayIPAddressName: aro-hcp-istio-ingress
istioctlVersion: 1.24.1
tag: prod-stable
targetVersion: asm-1-25
versions: asm-1-25
targetVersion: asm-1-26
versions: asm-1-26
nsp:
accessMode: Learning
name: nsp-usw3ptest-svc
Expand Down
5 changes: 3 additions & 2 deletions config/rendered/dev/pers/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ hypershift:
digest: sha256:35f451ffdb9ef4fc0ad24b0d11521dc4f6e053a63ba0d884dd6de0d03d2d547d
registry: quay.io
repository: redhat-services-prod/crt-redhat-acm-tenant/hypershift/hypershift-operator
limitClusterSizes: true
namespace: hypershift
sharedIngressIPTag: ""
imageSync:
Expand Down Expand Up @@ -753,8 +754,8 @@ svc:
ingressGatewayIPAddressName: aro-hcp-istio-ingress
istioctlVersion: 1.24.1
tag: prod-stable
targetVersion: asm-1-25
versions: asm-1-25
targetVersion: asm-1-26
versions: asm-1-26
jaeger:
deploy: true
nsp:
Expand Down
7 changes: 4 additions & 3 deletions config/rendered/dev/prow/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ hypershift:
digest: sha256:35f451ffdb9ef4fc0ad24b0d11521dc4f6e053a63ba0d884dd6de0d03d2d547d
registry: quay.io
repository: redhat-services-prod/crt-redhat-acm-tenant/hypershift/hypershift-operator
limitClusterSizes: true
namespace: hypershift
sharedIngressIPTag: ""
imageSync:
Expand Down Expand Up @@ -461,7 +462,7 @@ mgmt:
zones: ""
userAgentPool:
maxCount: 14
minCount: 1
minCount: 4
osDiskSizeGB: 100
poolCount: 3
vmSize: Standard_D4s_v3
Expand Down Expand Up @@ -753,8 +754,8 @@ svc:
ingressGatewayIPAddressName: aro-hcp-istio-ingress
istioctlVersion: 1.24.1
tag: prod-stable
targetVersion: asm-1-25
versions: asm-1-25
targetVersion: asm-1-26
versions: asm-1-26
jaeger:
deploy: true
nsp:
Expand Down
5 changes: 3 additions & 2 deletions config/rendered/dev/swft/uksouth.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ hypershift:
digest: sha256:35f451ffdb9ef4fc0ad24b0d11521dc4f6e053a63ba0d884dd6de0d03d2d547d
registry: quay.io
repository: redhat-services-prod/crt-redhat-acm-tenant/hypershift/hypershift-operator
limitClusterSizes: true
namespace: hypershift
sharedIngressIPTag: ""
imageSync:
Expand Down Expand Up @@ -753,8 +754,8 @@ svc:
ingressGatewayIPAddressName: aro-hcp-istio-ingress
istioctlVersion: 1.24.1
tag: prod-stable
targetVersion: asm-1-25
versions: asm-1-25
targetVersion: asm-1-26
versions: asm-1-26
nsp:
accessMode: Learning
name: nsp-lnstest-svc
Expand Down
4 changes: 2 additions & 2 deletions dev-infrastructure/zz_fixture_TestHelmTemplate_dev_westus3_svc_1_istio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ kind: ConfigMap
apiVersion: v1
metadata:
labels:
istio.io/rev: 'asm-1-25'
name: istio-shared-configmap-asm-1-25
istio.io/rev: 'asm-1-26'
name: istio-shared-configmap-asm-1-26
namespace: aks-istio-system
data:
mesh: |-
Expand Down
51 changes: 51 additions & 0 deletions hypershiftoperator/deploy/templates/cluster.clustersizingconfiguration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,53 @@
---
{{ if .Values.limitClusterSizes }}
apiVersion: scheduling.hypershift.openshift.io/v1alpha1
kind: ClusterSizingConfiguration
metadata:
name: cluster
annotations:
"helm.sh/hook": post-install,post-upgrade
"helm.sh/hook-weight": "2"
spec:
concurrency:
limit: 9999
Copy link
Collaborator

@SudoBrendan SudoBrendan Jan 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need to tweak this concurrency limit - in my read of hypershift, this does not impact new clusters - only "day 2" adjustments.

refs:

  1. https://github.com/openshift/hypershift/blob/9f235bbfaf8999cb1325f3c46c815e988460f93d/api/scheduling/v1alpha1/clustersizingconfiguration_types.go#L44-L51
  2. https://github.com/openshift/hypershift/blob/9f235bbfaf8999cb1325f3c46c815e988460f93d/hypershift-operator/controllers/hostedclustersizing/hostedclustersizing_controller_test.go#L1378

slidingWindow: 0s
sizes:
- criteria:
from: 0
effects:
maximumMutatingRequestsInflight: 99999
maximumRequestsInflight: 99999
resourceRequests:
- containerName: kube-apiserver
deploymentName: kube-apiserver
memory: 100Mi
cpu: 100m
- containerName: openshift-controller-manager
deploymentName: openshift-controller-manager
memory: 100Mi
cpu: 100m
- containerName: cluster-policy-controller
deploymentName: cluster-policy-controller
memory: 100Mi
cpu: 100m
- containerName: kube-controller-manager
deploymentName: kube-controller-manager
memory: 100Mi
cpu: 100m
- containerName: openshift-apiserver
deploymentName: openshift-apiserver
memory: 100Mi
cpu: 100m
- containerName: etcd
deploymentName: etcd
memory: 100Mi
cpu: 100m
- containerName: ovnkube-control-plane
deploymentName: ovnkube-control-plane
memory: 100Mi
cpu: 100m
name: e2e_minimal
{{ else }}
apiVersion: scheduling.hypershift.openshift.io/v1alpha1
kind: ClusterSizingConfiguration
metadata:
Expand Down Expand Up @@ -192,3 +242,4 @@ spec:
transitionDelay:
decrease: 20m
increase: 0s
{{ end }}
1 change: 1 addition & 0 deletions hypershiftoperator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ azureKeyVaultClientId: "__csiSecretStoreClientId__"
additionalArgs: "{{ .hypershift.additionalInstallArg }}"
operatorEnvVars:
sharedIngressIPTag: "{{ .hypershift.sharedIngressIPTag }}"
limitClusterSizes: {{ .hypershift.limitClusterSizes }}
Loading