From 3fa7a3240b87600c4b72f959d5281ec3eecf14df Mon Sep 17 00:00:00 2001 From: Martin Gencur Date: Fri, 15 Mar 2024 09:46:32 +0100 Subject: [PATCH 1/3] Serverless cluster pool --- clusters/hive/pools/serverless/OWNERS | 11 +++++ .../admins_serverless-cluster-pool_rbac.yaml | 33 +++++++++++++++ .../install-config-aws-us-east-1_secret.yaml | 40 +++++++++++++++++++ ...-14-0-amd64-aws-us-east-1_clusterpool.yaml | 35 ++++++++++++++++ 4 files changed, 119 insertions(+) create mode 100644 clusters/hive/pools/serverless/OWNERS create mode 100644 clusters/hive/pools/serverless/admins_serverless-cluster-pool_rbac.yaml create mode 100644 clusters/hive/pools/serverless/install-config-aws-us-east-1_secret.yaml create mode 100644 clusters/hive/pools/serverless/serverless-ocp-4-14-0-amd64-aws-us-east-1_clusterpool.yaml diff --git a/clusters/hive/pools/serverless/OWNERS b/clusters/hive/pools/serverless/OWNERS new file mode 100644 index 000000000000..4b1e0e18edd2 --- /dev/null +++ b/clusters/hive/pools/serverless/OWNERS @@ -0,0 +1,11 @@ +approvers: +- aliok +- creydr +- dsimansk +- lberk +- matzew +- mgencur +- pierDipi +- ReToCode +- rhuss +- skonto diff --git a/clusters/hive/pools/serverless/admins_serverless-cluster-pool_rbac.yaml b/clusters/hive/pools/serverless/admins_serverless-cluster-pool_rbac.yaml new file mode 100644 index 000000000000..f14aed54772b --- /dev/null +++ b/clusters/hive/pools/serverless/admins_serverless-cluster-pool_rbac.yaml @@ -0,0 +1,33 @@ +apiVersion: v1 +items: +- apiVersion: v1 + kind: Namespace + metadata: + name: serverless-cluster-pool +- apiVersion: rbac.authorization.k8s.io/v1 + kind: RoleBinding + metadata: + name: serverless-pool-admins + namespace: serverless-cluster-pool + roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: hive-cluster-pool-admin + subjects: + - apiGroup: rbac.authorization.k8s.io + kind: Group + name: serverless-pool-admins +- apiVersion: rbac.authorization.k8s.io/v1 + kind: ClusterRoleBinding + metadata: + name: serverless-pool-admins + roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: cluster-namespace-view + subjects: + - apiGroup: rbac.authorization.k8s.io + kind: Group + name: serverless-pool-admins +kind: List +metadata: {} diff --git a/clusters/hive/pools/serverless/install-config-aws-us-east-1_secret.yaml b/clusters/hive/pools/serverless/install-config-aws-us-east-1_secret.yaml new file mode 100644 index 000000000000..823a2b4e6ece --- /dev/null +++ b/clusters/hive/pools/serverless/install-config-aws-us-east-1_secret.yaml @@ -0,0 +1,40 @@ +apiVersion: v1 +kind: Secret +metadata: + name: install-config-aws-us-east-1 + namespace: serverless-cluster-pool +stringData: + install-config.yaml: | + apiVersion: v1 + baseDomain: serverless.devcluster.openshift.com + compute: + - architecture: amd64 + hyperthreading: Enabled + name: worker + platform: + aws: + type: m5.xlarge + replicas: 3 + controlPlane: + architecture: amd64 + hyperthreading: Enabled + name: master + platform: {} + replicas: 3 + metadata: + creationTimestamp: null + name: test01 + networking: + clusterNetwork: + - cidr: 10.128.0.0/14 + hostPrefix: 23 + machineNetwork: + - cidr: 10.0.0.0/16 + networkType: OVNKubernetes + serviceNetwork: + - 172.30.0.0/16 + platform: + aws: + region: us-east-1 + publish: External +type: Opaque diff --git a/clusters/hive/pools/serverless/serverless-ocp-4-14-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/serverless/serverless-ocp-4-14-0-amd64-aws-us-east-1_clusterpool.yaml new file mode 100644 index 000000000000..4a5b78f62ff4 --- /dev/null +++ b/clusters/hive/pools/serverless/serverless-ocp-4-14-0-amd64-aws-us-east-1_clusterpool.yaml @@ -0,0 +1,35 @@ +apiVersion: hive.openshift.io/v1 +kind: ClusterPool +metadata: + labels: + architecture: amd64 + cloud: aws + owner: serverless-ci + product: ocp + region: us-east-1 + version: "4.14" + version_lower: 4.14.0-0 + version_upper: 4.15.0-0 + name: serverless-ocp-4-14-amd64-aws-us-east-1 + namespace: serverless-cluster-pool +spec: + baseDomain: serverless.devcluster.openshift.com + hibernationConfig: + resumeTimeout: 20m0s + imageSetRef: + name: ocp-release-4.14.17-x86-64-for-4.14.0-0-to-4.15.0-0 + installAttemptsLimit: 1 + installConfigSecretTemplateRef: + name: install-config-aws-us-east-1 + labels: + tp.openshift.io/owner: serverless-ci + maxSize: 10 + platform: + aws: + credentialsSecretRef: + name: serverless-aws-credentials + region: us-east-1 + pullSecretRef: + name: pull-secret + size: 4 + skipMachinePools: true From 1f8aa45697e299222551485dfc5b34c61d75c29d Mon Sep 17 00:00:00 2001 From: Martin Gencur Date: Fri, 15 Mar 2024 10:27:32 +0100 Subject: [PATCH 2/3] Use OCP 4.15 instead of 4.14 --- ...less-ocp-4-15-amd64-aws-us-east-1_clusterpool.yaml} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename clusters/hive/pools/serverless/{serverless-ocp-4-14-0-amd64-aws-us-east-1_clusterpool.yaml => serverless-ocp-4-15-amd64-aws-us-east-1_clusterpool.yaml} (78%) diff --git a/clusters/hive/pools/serverless/serverless-ocp-4-14-0-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/serverless/serverless-ocp-4-15-amd64-aws-us-east-1_clusterpool.yaml similarity index 78% rename from clusters/hive/pools/serverless/serverless-ocp-4-14-0-amd64-aws-us-east-1_clusterpool.yaml rename to clusters/hive/pools/serverless/serverless-ocp-4-15-amd64-aws-us-east-1_clusterpool.yaml index 4a5b78f62ff4..213b51c5ea1e 100644 --- a/clusters/hive/pools/serverless/serverless-ocp-4-14-0-amd64-aws-us-east-1_clusterpool.yaml +++ b/clusters/hive/pools/serverless/serverless-ocp-4-15-amd64-aws-us-east-1_clusterpool.yaml @@ -7,17 +7,17 @@ metadata: owner: serverless-ci product: ocp region: us-east-1 - version: "4.14" - version_lower: 4.14.0-0 - version_upper: 4.15.0-0 - name: serverless-ocp-4-14-amd64-aws-us-east-1 + version: "4.15" + version_lower: 4.15.0-0 + version_upper: 4.16.0-0 + name: serverless-ocp-4-15-amd64-aws-us-east-1 namespace: serverless-cluster-pool spec: baseDomain: serverless.devcluster.openshift.com hibernationConfig: resumeTimeout: 20m0s imageSetRef: - name: ocp-release-4.14.17-x86-64-for-4.14.0-0-to-4.15.0-0 + name: ocp-release-4.15.3-x86-64-for-4.15.0-0-to-4.16.0-0 installAttemptsLimit: 1 installConfigSecretTemplateRef: name: install-config-aws-us-east-1 From 4064a9d7ee848a90af3c93f122793f5e2195a833 Mon Sep 17 00:00:00 2001 From: Martin Gencur Date: Mon, 18 Mar 2024 07:57:22 +0100 Subject: [PATCH 3/3] Increase max size to 12 --- .../serverless-ocp-4-15-amd64-aws-us-east-1_clusterpool.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clusters/hive/pools/serverless/serverless-ocp-4-15-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hive/pools/serverless/serverless-ocp-4-15-amd64-aws-us-east-1_clusterpool.yaml index 213b51c5ea1e..d71dc07ddeee 100644 --- a/clusters/hive/pools/serverless/serverless-ocp-4-15-amd64-aws-us-east-1_clusterpool.yaml +++ b/clusters/hive/pools/serverless/serverless-ocp-4-15-amd64-aws-us-east-1_clusterpool.yaml @@ -23,7 +23,7 @@ spec: name: install-config-aws-us-east-1 labels: tp.openshift.io/owner: serverless-ci - maxSize: 10 + maxSize: 12 platform: aws: credentialsSecretRef: