Merge branch 'release/v0.14.4' into main

CHANGELOG.md

@@ -7,6 +7,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [v0.14.4] - 2024-11-06
+### Fixed
+- [#48] Map nginx dependency to `nginx-ingress` and `nginx-static`.
+Both Dogus are required in the installation process in the dogu-operator.
+Only mapping `nginx-ingress` can result in following installation order `ingress`, `cas`, `static` because the `nginx-ingress` has no dependency and the new dependency sorting algorithm is not deterministic.
+
 ## [v0.14.3] - 2024-10-30
 ### Fixed
 - [#47] map nginx dependencies to k8s equivalent dogus 

Makefile

@@ -1,6 +1,6 @@
 # Set these to the desired values
 ARTIFACT_ID=cesapp-lib
-VERSION=0.14.3
+VERSION=0.14.4
 
 GOTAG?=1.18.6
 MAKEFILES_VERSION=7.4.0

core/dogu-sort.go

@@ -11,8 +11,13 @@ var (
 		Type: DependencyTypeDogu,
 		Name: "nginx-ingress",
 	}
-	k8sDependencyMapping = map[string]Dependency{
-		"nginx": nginxIngressDependency,
+
+	nginxStaticDependency = Dependency{
+		Type: DependencyTypeDogu,
+		Name: "nginx-static",
+	}
+	k8sDependencyMapping = map[string][]Dependency{
+		"nginx": {nginxIngressDependency, nginxStaticDependency},
 	}
 )
 
@@ -153,7 +158,7 @@ func (bd *sortByDependency) dependenciesToDogus(dependencies []Dependency) []*Do
 func appendK8sMappedDependencies(dependencies []Dependency) []Dependency {
 	for _, dep := range dependencies {
 		if _, ok := k8sDependencyMapping[dep.Name]; ok {
-			dependencies = append(dependencies, k8sDependencyMapping[dep.Name])
+			dependencies = append(dependencies, k8sDependencyMapping[dep.Name]...)
 		}
 	}
 	return dependencies