Merge pull request #1949 from shiftstack/issue1948

k8s-ci-robot · web-flow · commit 4ab8b3a34ebc · 2024-03-15T01:13:08.000-07:00
🐛 v1alpha5: Fix panic in conversion when port has no binding profile
diff --git a/api/v1alpha5/conversion.go b/api/v1alpha5/conversion.go
@@ -335,13 +335,16 @@ func Convert_v1beta1_PortOpts_To_v1alpha5_PortOpts(in *infrav1.PortOpts, out *Po
 		}
 	}
 
-	out.Profile = make(map[string]string)
-	if pointer.BoolDeref(in.Profile.OVSHWOffload, false) {
-		(out.Profile)["capabilities"] = "[\"switchdev\"]"
-	}
-	if pointer.BoolDeref(in.Profile.TrustedVF, false) {
-		(out.Profile)["trusted"] = trueString
+	if in.Profile != nil {
+		out.Profile = make(map[string]string)
+		if pointer.BoolDeref(in.Profile.OVSHWOffload, false) {
+			(out.Profile)["capabilities"] = "[\"switchdev\"]"
+		}
+		if pointer.BoolDeref(in.Profile.TrustedVF, false) {
+			(out.Profile)["trusted"] = trueString
+		}
 	}
+
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -335,13 +335,16 @@ func Convert_v1beta1_PortOpts_To_v1alpha5_PortOpts(in infrav1.PortOpts, out Po`
`335`	`335`	`}`
`336`	`336`	`}`
`337`	`337`
`338`		`- out.Profile = make(map[string]string)`
`339`		`- if pointer.BoolDeref(in.Profile.OVSHWOffload, false) {`
`340`		`- (out.Profile)["capabilities"] = "[\"switchdev\"]"`
`341`		`- }`
`342`		`- if pointer.BoolDeref(in.Profile.TrustedVF, false) {`
`343`		`- (out.Profile)["trusted"] = trueString`
	`338`	`+ if in.Profile != nil {`
	`339`	`+ out.Profile = make(map[string]string)`
	`340`	`+ if pointer.BoolDeref(in.Profile.OVSHWOffload, false) {`
	`341`	`+ (out.Profile)["capabilities"] = "[\"switchdev\"]"`
	`342`	`+ }`
	`343`	`+ if pointer.BoolDeref(in.Profile.TrustedVF, false) {`
	`344`	`+ (out.Profile)["trusted"] = trueString`
	`345`	`+ }`
`344`	`346`	`}`
	`347`	`+`
`345`	`348`	`return nil`
`346`	`349`	`}`
`347`	`350`