Skip to content

Commit 3bdee8d

Browse files
committed
Merge branch 'dev' into feat-dora-metrics
2 parents 3069cb0 + ce88f63 commit 3bdee8d

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
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

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/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/giteaInit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ create_repo_content_platform() {
186186
cp -r ${REPO_ROOT}/deployment/addons/kubevela ${REPO_ROOT}/applications/gitea/$repo_name/
187187
cp -r ${REPO_ROOT}/platform/backstage ${REPO_ROOT}/applications/gitea/$repo_name/
188188
# Replacing hostname in backstage catalog file
189-
sed -i "s/HOSTNAME/${DOMAIN_NAME}/g" ${REPO_ROOT}/applications/gitea/$repo_name/backstage/templates/catalog-info.yaml
189+
sed -e "s#HOSTNAME#${DOMAIN_NAME}#g" ${REPO_ROOT}/platform/backstage/templates/catalog-info.yaml > ${REPO_ROOT}/applications/gitea/$repo_name/backstage/templates/catalog-info.yaml
190190

191191
git add .
192192
git -c http.sslVerify=false commit -m "first commit"

platform/infra/terraform/prod/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" {

0 commit comments

Comments
 (0)