Skip to content

Commit 56d11da

Browse files
authored
feature/kubelet maxpodsize pr (#22)
* ESO and maxPodSize changed in the pattern - OpenShift ESO support is now part of the pattern. The applications have been updatedate to use the new apiVersion. - To support the large number of pods being deployed per hosted cluster we updated the maxpods count to 500. this should allow us to utilize more of the compute capacity before triggering the cluster autoscaler. - Update the MCE to 2.11 - and updated the feature list to fix out of sync errors. * add pattern-metadata for UI
1 parent bd2b491 commit 56d11da

12 files changed

Lines changed: 136 additions & 25 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ pattern-vault.init
77
vault.init
88
super-linter.log
99
common/pattern-vault.init
10+
.cursor/*

charts/all/groupsync/templates/eso-github-groupsync.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{{- if not ($gs.disabled | default false) }}
55
{{- $vaultKey := .Values.global.groupsync.githubAppKeyPath | default .Values.githubAppKeyPath | default "secret/data/hub/githubGroupSync" }}
66
---
7-
apiVersion: "external-secrets.io/v1beta1"
7+
apiVersion: "external-secrets.io/v1"
88
kind: ExternalSecret
99
metadata:
1010
name: {{ .Values.global.groupsync.secretName }}

charts/all/hypershift/templates/eso-hypershift-aws.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{- if .Values.global.useExternalSecrets }}
22
---
3-
apiVersion: "external-secrets.io/v1beta1"
3+
apiVersion: "external-secrets.io/v1"
44
kind: ExternalSecret
55
metadata:
66
name: hypershift-eso-aws

charts/all/hypershift/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,3 +122,5 @@ mce:
122122
enabled: "false"
123123
- name: cluster-api-provider-openshift-assisted
124124
enabled: "false"
125+
- name: cluster-api-provider-azure-preview
126+
enabled: "false"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: v2
2+
name: kubelet-config
3+
description: A Helm chart for configuring KubeletConfig to adjust maxPods
4+
5+
type: application
6+
7+
version: 0.1.0
8+
9+
appVersion: "0.1.0"
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
apiVersion: machineconfiguration.openshift.io/v1
2+
kind: KubeletConfig
3+
metadata:
4+
name: set-max-pods
5+
spec:
6+
machineConfigPoolSelector:
7+
matchLabels:
8+
pools.operator.machineconfiguration.openshift.io/{{ .Values.kubelet.targetPool }}: ""
9+
kubeletConfig:
10+
maxPods: {{ .Values.kubelet.maxPods }}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# KubeletConfig settings
2+
kubelet:
3+
maxPods: 500
4+
# MachineConfigPool role segment: "worker" for normal clusters; "master" for compact/3-node
5+
# hubs where all nodes are in the master pool (worker MCP has no machines).
6+
targetPool: worker

charts/all/oauth/templates/eso-github-oauth.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: "external-secrets.io/v1beta1"
2+
apiVersion: "external-secrets.io/v1"
33
kind: ExternalSecret
44
metadata:
55
name: {{ .Values.global.oauth.secretName }}

pattern-metadata.yaml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# This goal of this metadata is mainly used as a source of truth for
2+
# documentation and qe
3+
metadata_version: "1.0"
4+
name: hypershift
5+
description: An infrastructure pattern for deploying and managing OpenShift clusters using HyperShift.
6+
pattern_version: "1.0"
7+
display_name: HyperShift
8+
repo_url: https://github.com/validatedpatterns-sandbox/hypershift
9+
docs_repo_url: https://github.com/validatedpatterns/docs
10+
issues_url: https://github.com/validatedpatterns-sandbox/hypershift/issues
11+
docs_url: https://validatedpatterns.io/patterns/hypershift/
12+
ci_url: https://validatedpatterns.io/ci/?pattern=hypershift
13+
# can be sandbox, tested or maintained
14+
tier: tested
15+
owners: day0hero
16+
requirements:
17+
hub: # Main cluster
18+
compute:
19+
platform:
20+
gcp:
21+
replicas: 3
22+
type: n1-standard-8
23+
azure:
24+
replicas: 3
25+
type: Standard_D8s_v3
26+
aws:
27+
replicas: 3
28+
type: m5.4xlarge
29+
controlPlane:
30+
platform:
31+
gcp:
32+
replicas: 3
33+
type: n1-standard-4
34+
azure:
35+
replicas: 3
36+
type: Standard_D4s_v3
37+
aws:
38+
replicas: 3
39+
type: m5.2xlarge
40+
41+
# Loosely defined extra features like hypershift support, non-openshift
42+
# kubernetes support, spoke support
43+
extra_features:
44+
hypershift_support: true
45+
spoke_support: false
46+
47+
external_requirements:
48+
# external quay, s3 bucket, agof tokens to access paywalled material, manifests, rag-llm hw (only selected regions)
49+
s3 bucket: true

values-global.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ global:
88
installPlanApproval: Automatic
99

1010
main:
11-
clusterGroupName: staging
11+
clusterGroupName: prod
1212
multiSourceConfig:
1313
enabled: true
1414
clusterGroupChartVersion: 0.9.*

0 commit comments

Comments
 (0)