Merge branch 'explicit-kernel-mgnt' into DONOTMERGE2

caos · Oct 14, 2021 · 50b6b6e · 50b6b6e
2 parents e25f8da + 5969015
commit 50b6b6e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/internal/operator/orbiter/kinds/clusters/kubernetes/software.go b/internal/operator/orbiter/kinds/clusters/kubernetes/software.go
@@ -226,7 +226,8 @@ func softwareContains(this common.Software, that common.Software) bool {
 		contains(this.Nginx, that.Nginx) &&
 		contains(this.Hostname, that.Hostname) &&
 		sysctl.Contains(this.Sysctl, that.Sysctl) &&
-		contains(this.Health, that.Health)
+		contains(this.Health, that.Health) &&
+		contains(this.Kernel, that.Kernel)
 }
 
 func contains(this, that common.Package) bool {
@@ -243,11 +244,11 @@ func softwareDefines(this common.Software, that common.Software) bool {
 		defines(this.Nginx, that.Nginx) &&
 		defines(this.Hostname, that.Hostname) &&
 		defines(this.Sysctl, that.Sysctl) &&
-		defines(this.Health, that.Health)
+		defines(this.Health, that.Health) &&
+		defines(this.Kernel, that.Kernel)
 }
 
 func defines(this, that common.Package) bool {
 	zeroPkg := common.Package{}
-	defines := common.PackageEquals(that, zeroPkg) || !common.PackageEquals(this, zeroPkg)
-	return defines
+	return common.PackageEquals(that, zeroPkg) || !common.PackageEquals(this, zeroPkg)
 }