Merge branch 'release/v6.0.0'

Author: robertauer

CHANGELOG.md

@@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [v6.0.0] - 2026-04-13
+### Changed
+ - [#137] prepare modules for using with ecosystem-core v4
+   - stopped flag configurable
+   - enableFqdnApplier flag configurable
+   - removed loadbalancer patch
+   - pass external ip as annotation
+
 ## [v5.8.0] - 2026-03-19
 ### Changed 
 - [#134] replace nginx dogus with k8s-ces-gateway

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

@@ -8,6 +8,7 @@ metadata:
   namespace: ${ces_namespace}
 spec:
   displayName: "Blueprint Terraform CES-Module"
+  stopped: ${stopped}
   blueprint:
     dogus:
       ${indent(6, yamlencode(dogus))}

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

@@ -38,6 +38,7 @@ locals {
       "doguConfigs"   = local.doguConfigs
       "globalConfig"  = local.globalConfig
       "ces_namespace" = var.ces_namespace
+      "stopped"       = var.stopped
     }))
 
 
@@ -81,6 +82,7 @@ locals {
     }) ,
     spec = merge(try(local.passed_blueprint.spec, {}), {
       blueprint = merge(try(local.passed_blueprint.spec.blueprint, {}), {
+        stopped = var.stopped,
         dogus = local.merged_dogus,
         config = {
           dogus = local.merged_blueprint_doguConfigs,

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

@@ -22,6 +22,12 @@ variable "ces_fqdn" {
   type        = string
 }
 
+# Stopped
+variable "stopped" {
+  description = "If true, the blueprint is created but not executed"
+  type        = bool
+}
+
 # Certificate
 variable "ces_certificate_path" {
   # 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

@@ -38,6 +38,8 @@ resource "helm_release" "ecosystem-core" {
       {
         "component_operator_image"                       = local.component_operator_image
         "components"                                     = var.components
+        "enable_fqdn_applier"                            = var.enable_fqdn_applier
+        "extIPName"                                      = var.externalIP
       })
   ]
 

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

@@ -3,6 +3,9 @@
 # Declare variables to be passed into your templates.
 
 skipPreconditionValidation: false
+loadbalancer-annotations:
+  cloud.google.com/l4-rbs: "enabled"
+  networking.gke.io/load-balancer-ip-addresses: "${extIPName}"
 k8s-component-operator:
   manager:
     image:
@@ -77,3 +80,4 @@ monitoring:
 defaultConfig:
   env:
     waitTimeoutMinutes: 15
+    enableFqdnApplier: ${enable_fqdn_applier}

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

@@ -27,6 +27,12 @@ variable "ces_namespace" {
   type        = string
 }
 
+# FQDN-Apply
+variable "enable_fqdn_applier" {
+  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."
+  type        = bool
+}
+
 # List of components, backup components and monitoring components
 variable "components" {
   description = "A list of components, ordered by default components, backup and monitoring."

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

@@ -107,6 +107,8 @@ module "ces-core" {
   ces_admin_password = var.ces_admin_password
 
   cas_oidc_client_secret = var.cas_oidc_client_secret
+
+  enable_fqdn_applier = var.enable_fqdn_applier
 }
 
 module "ces-blueprint" {
@@ -126,6 +128,7 @@ module "ces-blueprint" {
   ces_certificate_path = var.ces_certificate_path
   ces_namespace = var.ces_namespace
   ces_fqdn = var.ces_fqdn
+  stopped = var.blueprint_stopped
 
   dogus = var.dogus