Skip to content

Commit 489e4fc

Browse files
committed
Merge branch 'release/v6.0.0'
2 parents c4cffa2 + 216ee20 commit 489e4fc

11 files changed

Lines changed: 47 additions & 37 deletions

File tree

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

88
## [Unreleased]
9+
10+
## [v6.0.0] - 2026-04-13
11+
### Changed
12+
- [#137] prepare modules for using with ecosystem-core v4
13+
- stopped flag configurable
14+
- enableFqdnApplier flag configurable
15+
- removed loadbalancer patch
16+
- pass external ip as annotation
17+
918
## [v5.8.0] - 2026-03-19
1019
### Changed
1120
- [#134] replace nginx dogus with k8s-ces-gateway

terraform/ces-module/ces-blueprint/blueprint.yaml.tftpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ metadata:
88
namespace: ${ces_namespace}
99
spec:
1010
displayName: "Blueprint Terraform CES-Module"
11+
stopped: ${stopped}
1112
blueprint:
1213
dogus:
1314
${indent(6, yamlencode(dogus))}

terraform/ces-module/ces-blueprint/main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ locals {
3838
"doguConfigs" = local.doguConfigs
3939
"globalConfig" = local.globalConfig
4040
"ces_namespace" = var.ces_namespace
41+
"stopped" = var.stopped
4142
}))
4243

4344

@@ -81,6 +82,7 @@ locals {
8182
}) ,
8283
spec = merge(try(local.passed_blueprint.spec, {}), {
8384
blueprint = merge(try(local.passed_blueprint.spec.blueprint, {}), {
85+
stopped = var.stopped,
8486
dogus = local.merged_dogus,
8587
config = {
8688
dogus = local.merged_blueprint_doguConfigs,

terraform/ces-module/ces-blueprint/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ variable "ces_fqdn" {
2222
type = string
2323
}
2424

25+
# Stopped
26+
variable "stopped" {
27+
description = "If true, the blueprint is created but not executed"
28+
type = bool
29+
}
30+
2531
# Certificate
2632
variable "ces_certificate_path" {
2733
# Dev Cert: openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -days 365 -nodes -subj "/C=US/ST=Oregon/L=Portland/O=CompanyName/OU=DepartmentName/CN=example.com"

terraform/ces-module/ces-core/loadbalancer.tf

Lines changed: 0 additions & 28 deletions
This file was deleted.

terraform/ces-module/ces-core/loadbalancer.yaml.tftpl

Lines changed: 0 additions & 9 deletions
This file was deleted.

terraform/ces-module/ces-core/main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ resource "helm_release" "ecosystem-core" {
3838
{
3939
"component_operator_image" = local.component_operator_image
4040
"components" = var.components
41+
"enable_fqdn_applier" = var.enable_fqdn_applier
42+
"extIPName" = var.externalIP
4143
})
4244
]
4345

terraform/ces-module/ces-core/values.yaml.tftpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
# Declare variables to be passed into your templates.
44

55
skipPreconditionValidation: false
6+
loadbalancer-annotations:
7+
cloud.google.com/l4-rbs: "enabled"
8+
networking.gke.io/load-balancer-ip-addresses: "${extIPName}"
69
k8s-component-operator:
710
manager:
811
image:
@@ -77,3 +80,4 @@ monitoring:
7780
defaultConfig:
7881
env:
7982
waitTimeoutMinutes: 15
83+
enableFqdnApplier: ${enable_fqdn_applier}

terraform/ces-module/ces-core/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ variable "ces_namespace" {
2727
type = string
2828
}
2929

30+
# FQDN-Apply
31+
variable "enable_fqdn_applier" {
32+
description = "If set to true, the fqdn applier will be enabled. This is used in environments where dns isn't available and the loadbalancer ip should be the fqdn of the ecosystem. (Typically development environments) While deploying the components, the applier will wait for the loadbalancer service to be created and use the external ip to set it in the global config as fqdn. If set to false, the fqdn has to be set by the blueprint config or manually. This is required for dogus to start."
33+
type = bool
34+
}
35+
3036
# List of components, backup components and monitoring components
3137
variable "components" {
3238
description = "A list of components, ordered by default components, backup and monitoring."

terraform/ces-module/main.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ module "ces-core" {
107107
ces_admin_password = var.ces_admin_password
108108

109109
cas_oidc_client_secret = var.cas_oidc_client_secret
110+
111+
enable_fqdn_applier = var.enable_fqdn_applier
110112
}
111113

112114
module "ces-blueprint" {
@@ -126,6 +128,7 @@ module "ces-blueprint" {
126128
ces_certificate_path = var.ces_certificate_path
127129
ces_namespace = var.ces_namespace
128130
ces_fqdn = var.ces_fqdn
131+
stopped = var.blueprint_stopped
129132

130133
dogus = var.dogus
131134

0 commit comments

Comments
 (0)