resolve conflict

This commit is contained in:
Felix Kunde
2022-05-18 17:19:27 +02:00
5 changed files with 36 additions and 44 deletions
+9 -1
View File
@@ -323,12 +323,20 @@ func testNil(values ...*int32) bool {
return false
}
// Convert int to IntOrString type
// ToIntStr converts int to IntOrString type
func ToIntStr(val int) *intstr.IntOrString {
b := intstr.FromInt(val)
return &b
}
// Bool2Int converts bool to int
func Bool2Int(flag bool) int {
if flag {
return 1
}
return 0
}
// MaxInt32 : Return maximum of two integers provided via pointers. If one value
// is not defined, return the other one. If both are not defined, result is also
// undefined, caller needs to check for that.