Skip to content
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

upgrading production kustomize #2515

Merged
merged 4 commits into from
Apr 9, 2024
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
68 changes: 0 additions & 68 deletions env/production/karpenter.yaml

This file was deleted.

11 changes: 11 additions & 0 deletions env/production/karpenter/aws-node-template-patch.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: karpenter.k8s.aws/v1alpha1
kind: AWSNodeTemplate
metadata:
name: default
spec:
subnetSelector:
karpenter.sh/discovery: notification-canada-ca-production-eks-cluster
securityGroupSelector:
karpenter.sh/discovery: notification-canada-ca-production-eks-cluster
metadataOptions:
httpTokens: optional
24 changes: 24 additions & 0 deletions env/production/karpenter/configmap-patch.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: karpenter-global-settings
namespace: karpenter
labels:
app.kubernetes.io/name: karpenter
app.kubernetes.io/instance: karpenter
app.kubernetes.io/version: "0.30.0"
data:
"aws.assumeRoleARN": ""
"aws.assumeRoleDuration": "15m"
"aws.clusterCABundle": ""
"aws.clusterEndpoint": ""
"aws.clusterName": "notification-canada-ca-production-eks-cluster"
"aws.defaultInstanceProfile": "KarpenterNodeInstanceProfile-karpenter-controller-eks"
"aws.enableENILimitedPodDensity": "true"
"aws.enablePodENI": "false"
"aws.interruptionQueueName": ""
"aws.isolatedVPC": "false"
"aws.vmMemoryOverheadPercent": "0.075"
"batchIdleDuration": "1s"
"batchMaxDuration": "10s"
"featureGates.driftEnabled": "false"
18 changes: 18 additions & 0 deletions env/production/karpenter/provisioner-patch.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
apiVersion: karpenter.sh/v1alpha5
kind: Provisioner
metadata:
name: default
spec:
requirements:
- key: karpenter.sh/capacity-type
operator: In
values: ["spot"]
- key: node.kubernetes.io/instance-type
operator: In
values: ["r5.xlarge", "r5.large"]
limits:
resources:
cpu: 1000
providerRef:
name: default
ttlSecondsAfterEmpty: 300
11 changes: 11 additions & 0 deletions env/production/karpenter/service-account-patch.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: karpenter
namespace: karpenter
labels:
app.kubernetes.io/name: karpenter
app.kubernetes.io/instance: karpenter
app.kubernetes.io/version: "0.30.0"
annotations:
eks.amazonaws.com/role-arn: arn:aws:iam::296255494825:role/karpenter-controller-eks
39 changes: 35 additions & 4 deletions env/production/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,41 @@ resources:
- aws-auth-configmap.yaml

patches:
- performance.yaml
- cwagent-patch.yaml
- node-selector-patch.yaml
- karpenter.yaml
- path: cwagent/cwagent-deployment-patch.yaml

- path: performance/admin-deployment-patch.yaml
- path: performance/admin-hpa-patch.yaml
- path: performance/api-deployment-patch.yaml
- path: performance/api-hpa-patch.yaml
- path: performance/celery-email-send-primary-deployment-patch.yaml
- path: performance/celery-email-send-scalable-deployment-patch.yaml
- path: performance/celery-email-send-scalable-hpa-patch.yaml
- path: performance/celery-primary-deployment-patch.yaml
- path: performance/celery-scalable-deployment-patch.yaml
- path: performance/celery-scalable-hpa-patch.yaml
- path: performance/celery-sms-send-primary-deployment-patch.yaml
- path: performance/celery-sms-send-scalable-deployment-patch.yaml
- path: performance/celery-sms-send-scalable-hpa-patch.yaml
- path: performance/document-download-hpa-patch.yaml
- path: performance/documentation-deployment-patch.yaml

- path: nodeselectors/admin-node-selector-patch.yaml
- path: nodeselectors/api-node-selector-patch.yaml
- path: nodeselectors/celery-beat-node-selector-patch.yaml
- path: nodeselectors/celery-email-send-primary-node-selector-patch.yaml
- path: nodeselectors/celery-email-send-scalable-node-selector-patch.yaml
- path: nodeselectors/celery-primary-node-selector-patch.yaml
- path: nodeselectors/celery-scalable-node-selector-patch.yaml
- path: nodeselectors/celery-sms-node-selector-patch.yaml
- path: nodeselectors/celery-sms-send-primary-node-selector-patch.yaml
- path: nodeselectors/celery-sms-send-scalable-node-selector-patch.yaml
- path: nodeselectors/document-download-api-node-selector-patch.yaml
- path: nodeselectors/documentation-node-selector-patch.yaml

- path: karpenter/aws-node-template-patch.yaml
- path: karpenter/configmap-patch.yaml
- path: karpenter/provisioner-patch.yaml
- path: karpenter/service-account-patch.yaml

images:
- name: admin
Expand Down
183 changes: 0 additions & 183 deletions env/production/node-selector-patch.yaml

This file was deleted.

12 changes: 12 additions & 0 deletions env/production/nodeselectors/admin-node-selector-patch.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: admin
name: admin
namespace: notification-canada-ca
spec:
template:
spec:
nodeSelector:
eks.amazonaws.com/capacityType: ON_DEMAND
12 changes: 12 additions & 0 deletions env/production/nodeselectors/api-node-selector-patch.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: api
name: api
namespace: notification-canada-ca
spec:
template:
spec:
nodeSelector:
eks.amazonaws.com/capacityType: ON_DEMAND
Loading
Loading