diff --git a/config/config.schema.json b/config/config.schema.json index ff821a7e5d..a2445ab683 100644 --- a/config/config.schema.json +++ b/config/config.schema.json @@ -2109,6 +2109,9 @@ "FirstPartyUsage=/NonProd", "" ] + }, + "limitClusterSizes": { + "type": "boolean" } }, "additionalProperties": false, diff --git a/config/config.yaml b/config/config.yaml index 2456eece42..c53864ecc4 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -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 @@ -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 @@ -1420,6 +1421,7 @@ clouds: vmSize: Standard_D2s_v3 userAgentPool: maxCount: 14 + minCount: 4 osDiskSizeGB: 100 vmSize: Standard_D4s_v3 infraAgentPool: diff --git a/config/dev.digests.yaml b/config/dev.digests.yaml index b5c43c870c..360f281b39 100644 --- a/config/dev.digests.yaml +++ b/config/dev.digests.yaml @@ -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 diff --git a/config/rendered/dev/cspr/westus3.yaml b/config/rendered/dev/cspr/westus3.yaml index b0ff5cbf1b..37d694f04b 100755 --- a/config/rendered/dev/cspr/westus3.yaml +++ b/config/rendered/dev/cspr/westus3.yaml @@ -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: @@ -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 diff --git a/config/rendered/dev/dev/westus3.yaml b/config/rendered/dev/dev/westus3.yaml index 4160609e7b..19a5f93f07 100755 --- a/config/rendered/dev/dev/westus3.yaml +++ b/config/rendered/dev/dev/westus3.yaml @@ -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: @@ -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 diff --git a/config/rendered/dev/perf/westus3.yaml b/config/rendered/dev/perf/westus3.yaml index 5a8139ab85..a8252afd75 100755 --- a/config/rendered/dev/perf/westus3.yaml +++ b/config/rendered/dev/perf/westus3.yaml @@ -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: @@ -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 diff --git a/config/rendered/dev/pers/westus3.yaml b/config/rendered/dev/pers/westus3.yaml index 9bfdbbcf0f..f2a20b1fb7 100755 --- a/config/rendered/dev/pers/westus3.yaml +++ b/config/rendered/dev/pers/westus3.yaml @@ -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: @@ -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: diff --git a/config/rendered/dev/prow/westus3.yaml b/config/rendered/dev/prow/westus3.yaml index 675f684e78..d06aed63db 100755 --- a/config/rendered/dev/prow/westus3.yaml +++ b/config/rendered/dev/prow/westus3.yaml @@ -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: @@ -461,7 +462,7 @@ mgmt: zones: "" userAgentPool: maxCount: 14 - minCount: 1 + minCount: 4 osDiskSizeGB: 100 poolCount: 3 vmSize: Standard_D4s_v3 @@ -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: diff --git a/config/rendered/dev/swft/uksouth.yaml b/config/rendered/dev/swft/uksouth.yaml index 2e1104de9c..1bce7454a4 100755 --- a/config/rendered/dev/swft/uksouth.yaml +++ b/config/rendered/dev/swft/uksouth.yaml @@ -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: @@ -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 diff --git a/dev-infrastructure/zz_fixture_TestHelmTemplate_dev_westus3_svc_1_istio.yaml b/dev-infrastructure/zz_fixture_TestHelmTemplate_dev_westus3_svc_1_istio.yaml index 005c7663d8..7a592e1a4a 100644 --- a/dev-infrastructure/zz_fixture_TestHelmTemplate_dev_westus3_svc_1_istio.yaml +++ b/dev-infrastructure/zz_fixture_TestHelmTemplate_dev_westus3_svc_1_istio.yaml @@ -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: |- diff --git a/hypershiftoperator/deploy/templates/cluster.clustersizingconfiguration.yaml b/hypershiftoperator/deploy/templates/cluster.clustersizingconfiguration.yaml index d6774a406f..cc53d50085 100644 --- a/hypershiftoperator/deploy/templates/cluster.clustersizingconfiguration.yaml +++ b/hypershiftoperator/deploy/templates/cluster.clustersizingconfiguration.yaml @@ -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 + 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: @@ -192,3 +242,4 @@ spec: transitionDelay: decrease: 20m increase: 0s +{{ end }} \ No newline at end of file diff --git a/hypershiftoperator/values.yaml b/hypershiftoperator/values.yaml index 57420871c3..2fc3c3028e 100644 --- a/hypershiftoperator/values.yaml +++ b/hypershiftoperator/values.yaml @@ -9,3 +9,4 @@ azureKeyVaultClientId: "__csiSecretStoreClientId__" additionalArgs: "{{ .hypershift.additionalInstallArg }}" operatorEnvVars: sharedIngressIPTag: "{{ .hypershift.sharedIngressIPTag }}" +limitClusterSizes: {{ .hypershift.limitClusterSizes }} diff --git a/hypershiftoperator/zz_fixture_TestHelmTemplate_dev_westus3_mgmt_1_hypershift.yaml b/hypershiftoperator/zz_fixture_TestHelmTemplate_dev_westus3_mgmt_1_hypershift.yaml index 8836b4acff..d42ab3f625 100644 --- a/hypershiftoperator/zz_fixture_TestHelmTemplate_dev_westus3_mgmt_1_hypershift.yaml +++ b/hypershiftoperator/zz_fixture_TestHelmTemplate_dev_westus3_mgmt_1_hypershift.yaml @@ -705,188 +705,41 @@ metadata: "helm.sh/hook-weight": "2" spec: concurrency: - limit: 5 + limit: 9999 slidingWindow: 0s sizes: - - criteria: - from: 0 - to: 60 - effects: - maximumMutatingRequestsInflight: 50 - maximumRequestsInflight: 150 - resourceRequests: - - containerName: kube-apiserver - deploymentName: kube-apiserver - memory: 8Gi - - containerName: openshift-controller-manager - deploymentName: openshift-controller-manager - memory: 1Gi - - containerName: cluster-policy-controller - deploymentName: cluster-policy-controller - memory: 1Gi - - containerName: kube-controller-manager - deploymentName: kube-controller-manager - memory: 1Gi - - containerName: openshift-apiserver - deploymentName: openshift-apiserver - memory: 1Gi - - containerName: etcd - deploymentName: etcd - memory: 1Gi - - containerName: ovnkube-control-plane - deploymentName: ovnkube-control-plane - memory: 500Mi - name: small - - criteria: - from: 61 - to: 120 - effects: - kasGoMemLimit: 12GiB - maximumMutatingRequestsInflight: 300 - maximumRequestsInflight: 900 - resourceRequests: - - containerName: kube-apiserver - deploymentName: kube-apiserver - memory: 16Gi - - containerName: openshift-controller-manager - deploymentName: openshift-controller-manager - memory: 2Gi - - containerName: cluster-policy-controller - deploymentName: cluster-policy-controller - memory: 2Gi - - containerName: kube-controller-manager - deploymentName: kube-controller-manager - memory: 2Gi - - containerName: cluster-autoscaler - deploymentName: cluster-autoscaler - memory: 2Gi - - containerName: openshift-apiserver - deploymentName: openshift-apiserver - memory: 1Gi - - containerName: etcd - deploymentName: etcd - memory: 1Gi - - containerName: kube-scheduler - deploymentName: kube-scheduler - memory: 1Gi - - containerName: ovnkube-control-plane - deploymentName: ovnkube-control-plane - memory: 500Mi - name: medium - - criteria: - from: 121 - to: 252 - effects: - kasGoMemLimit: 24GiB - maximumMutatingRequestsInflight: 400 - maximumRequestsInflight: 1200 - resourceRequests: - - containerName: kube-apiserver - deploymentName: kube-apiserver - memory: 32Gi - - containerName: openshift-controller-manager - deploymentName: openshift-controller-manager - memory: 3Gi - - containerName: cluster-policy-controller - deploymentName: cluster-policy-controller - memory: 2Gi - - containerName: kube-controller-manager - deploymentName: kube-controller-manager - memory: 2Gi - - containerName: cluster-autoscaler - deploymentName: cluster-autoscaler - memory: 4Gi - - containerName: openshift-apiserver - deploymentName: openshift-apiserver - memory: 2Gi - - containerName: etcd - deploymentName: etcd - memory: 2Gi - - containerName: kube-scheduler - deploymentName: kube-scheduler - memory: 2Gi - - containerName: multus-admission-controller - deploymentName: multus-admission-controller - memory: 1Gi - - containerName: ovnkube-control-plane - deploymentName: ovnkube-control-plane - memory: 1Gi - name: large - - criteria: - from: 253 - to: 360 - effects: - kasGoMemLimit: 48GiB - maximumMutatingRequestsInflight: 600 - maximumRequestsInflight: 2400 - resourceRequests: - - containerName: kube-apiserver - deploymentName: kube-apiserver - memory: 64Gi - - containerName: openshift-controller-manager - deploymentName: openshift-controller-manager - memory: 6Gi - - containerName: cluster-policy-controller - deploymentName: cluster-policy-controller - memory: 6Gi - - containerName: kube-controller-manager - deploymentName: kube-controller-manager - memory: 6Gi - - containerName: openshift-apiserver - deploymentName: openshift-apiserver - memory: 8Gi - - containerName: cluster-autoscaler - deploymentName: cluster-autoscaler - memory: 6Gi - - containerName: etcd - deploymentName: etcd - memory: 2Gi - - containerName: kube-scheduler - deploymentName: kube-scheduler - memory: 3Gi - - containerName: multus-admission-controller - deploymentName: multus-admission-controller - memory: 2Gi - - containerName: ovnkube-control-plane - deploymentName: ovnkube-control-plane - memory: 2Gi - name: xlarge - - criteria: - from: 361 - effects: - kasGoMemLimit: 72GiB - resourceRequests: - - containerName: kube-apiserver - deploymentName: kube-apiserver - memory: 96Gi - - containerName: openshift-controller-manager - deploymentName: openshift-controller-manager - memory: 8Gi - - containerName: cluster-policy-controller - deploymentName: cluster-policy-controller - memory: 8Gi - - containerName: kube-controller-manager - deploymentName: kube-controller-manager - memory: 8Gi - - containerName: openshift-apiserver - deploymentName: openshift-apiserver - memory: 8Gi - - containerName: cluster-autoscaler - deploymentName: cluster-autoscaler - memory: 12Gi - - containerName: etcd - deploymentName: etcd - memory: 3Gi - - containerName: kube-scheduler - deploymentName: kube-scheduler - memory: 6Gi - - containerName: multus-admission-controller - deploymentName: multus-admission-controller - memory: 3Gi - - containerName: ovnkube-control-plane - deploymentName: ovnkube-control-plane - memory: 2Gi - name: xxlarge - transitionDelay: - decrease: 20m - increase: 0s + - 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 diff --git a/istio/testdata/zz_fixture_TestHelmTemplate_istio_mise_enabled.yaml b/istio/testdata/zz_fixture_TestHelmTemplate_istio_mise_enabled.yaml index d61b4f20ab..3fa5583235 100644 --- a/istio/testdata/zz_fixture_TestHelmTemplate_istio_mise_enabled.yaml +++ b/istio/testdata/zz_fixture_TestHelmTemplate_istio_mise_enabled.yaml @@ -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: |- diff --git a/test/cmd/aro-hcp-tests/main.go b/test/cmd/aro-hcp-tests/main.go index 58d6e17b64..5bcbe1eaa2 100644 --- a/test/cmd/aro-hcp-tests/main.go +++ b/test/cmd/aro-hcp-tests/main.go @@ -96,7 +96,7 @@ func setupCli() *cobra.Command { ext.AddSuite(e.Suite{ Name: "rp-api-compat-all/parallel", Qualifiers: []string{rpApiCompatBaseQualifier}, - Parallelism: 20, + Parallelism: 10, }) // If using Ginkgo, build test specs automatically