Skip to content

Commit ce88f63

Browse files
authored
Merge pull request #243 from hmuthusamy/feature/eks-child-cluster-1.32
Feature/eks child cluster 1.32
2 parents 9a56547 + 65072fe commit ce88f63

File tree

12 files changed

+20
-17
lines changed

12 files changed

+20
-17
lines changed

applications/dotnet/src/WebUI/otel-collector-config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ exporters:
1313
authenticator: sigv4auth
1414
awsxray:
1515
region: us-east-1
16-
logging:
17-
loglevel: debug
16+
debug:
17+
verbosity: detailed
1818
extensions:
1919
sigv4auth:
2020
region: us-east-1

applications/next-js/lib/dynamo/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
Wishlist
1111
} from './types';
1212

13-
const API_URL = process.env.API_BASE_URL ?? 'http://rust-backend.team-rust-test.svc.cluster.local';
13+
const API_URL = process.env.API_BASE_URL ?? 'http://rust-backend.team-rust.svc.cluster.local';
1414

1515
// Helper function to handle fetch requests with error handling
1616
async function fetchWithErrorHandling<T>(url: string, options?: RequestInit): Promise<T | Error> {

deployment/addons/kubevela/templates/traits/path-based-ingress.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ spec:
4545
metadata: {
4646
name: context.name
4747
annotations: {
48-
if parameter.rewritePath {
49-
"nginx.ingress.kubernetes.io/rewrite-target": "/$2"
50-
"nginx.ingress.kubernetes.io/use-regex": "true"
51-
}
52-
}
48+
"nginx.ingress.kubernetes.io/use-regex": "true"
49+
if parameter.rewritePath {
50+
"nginx.ingress.kubernetes.io/rewrite-target": "/$2"
51+
}
52+
}
5353
}
5454
spec: {
5555
ingressClassName: parameter.class

docs/platform/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ This installation pattern where some Kubernetes manifests are handled in Terrafo
3636

3737
## Requirements
3838

39-
- An existing EKS cluster version (1.30+)
39+
- An existing EKS cluster version (1.32+)
4040
- AWS CLI (2.17+)
4141
- Kubectl CLI (1.30+)
4242
- jq

platform/backstage/templates/cicd-pipeline/provisioner/wf-templates.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ spec:
239239
resources:
240240
limits:
241241
cpu: 2
242-
memory: 5Gi
242+
memory: 6Gi
243243
env:
244244
- name: DOCKER_CONFIG
245245
value: /kaniko/.docker

platform/backstage/templates/cicd-pipeline/skeleton/manifests/cicd-pipeline.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ spec:
6969
storageClassName: gp3
7070
resources:
7171
requests:
72-
storage: 256Mi
72+
storage: 512Mi
7373
#volumes:
7474
#- name: cache
7575
# persistentVolumeClaim:
@@ -178,7 +178,7 @@ spec:
178178
resources:
179179
limits:
180180
cpu: 2
181-
memory: 5Gi
181+
memory: 6Gi
182182
env:
183183
- name: DOCKER_CONFIG
184184
value: /kaniko/.docker

platform/backstage/templates/jupyterhub-on-eks/template-jupyterhub-on-eks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
description: Cognito domain prefix for Hosted UI authentication endpoints
2121
type: string
2222
eks_cluster_version:
23-
default: "1.30"
23+
default: "1.32"
2424
description: EKS Cluster version
2525
type: string
2626
jupyter_hub_auth_mechanism:

platform/backstage/templates/spark-on-eks/template-data-on-eks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ spec:
1212
tfVars:
1313
properties:
1414
eks_cluster_version:
15-
default: "1.30"
15+
default: "1.32"
1616
description: EKS Cluster version
1717
type: string
1818
enable_amazon_prometheus:

platform/infra/terraform/dev/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ variable "managed_node_min_size" {
6060
variable "eks_version" {
6161
type = string
6262
description = "EKS Cluster version"
63-
default = "1.30"
63+
default = "1.32"
6464
}
6565

6666
variable "vpc_id" {

platform/infra/terraform/mgmt/terraform/mgmt-cluster/eks.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ output "configure_kubectl" {
6161
resource "kubernetes_storage_class" "ebs-gp3-sc" {
6262
metadata {
6363
name = "gp3"
64+
annotations = {
65+
"storageclass.kubernetes.io/is-default-class" = "true"
66+
}
6467
}
6568

6669
storage_provisioner = "ebs.csi.eks.amazonaws.com" # Altering this to target EKS Auto Mode.

0 commit comments

Comments
 (0)