pkey proper location

togethercomputer · Jan 31, 2025 · 3007040 · 3007040
1 parent 668138b
commit 3007040
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/api/v1/helper.go b/api/v1/helper.go
@@ -722,11 +722,13 @@ func (cr *SriovIBNetwork) RenderNetAttDef() (*uns.Unstructured, error) {
 		data.Data["CapabilitiesConfigured"] = true
 		data.Data["SriovCniCapabilities"] = cr.Spec.Capabilities
 	}
+	logger.Info("Pkey: ", "pkey", cr.Spec.PKey)
 	if cr.Spec.PKey == "" {
 		data.Data["pKeyConfigured"] = false
 	} else {
 		data.Data["pKeyConfigured"] = true
 		data.Data["pKey"] = cr.Spec.PKey
+		logger.Info("Pkey set!")
 	}
 	if cr.Spec.IPAM != "" {
 		data.Data["SriovCniIpam"] = SriovCniIpam + ":" + strings.Join(strings.Fields(cr.Spec.IPAM), "")

diff --git a/bindata/manifests/cni-config/sriov/sriov-cni-config.yaml b/bindata/manifests/cni-config/sriov/sriov-cni-config.yaml
@@ -34,13 +34,13 @@ spec:
 {{- if .MaxTxRateConfigured -}}
   "max_tx_rate":{{.SriovCniMaxTxRate}},
 {{- end -}}
-{{- if .pKeyConfigured -}}
-  "pkey":{{.pKey}},
-{{- end -}}
 {{- end -}}
 {{- if .CapabilitiesConfigured -}}
   "capabilities":{{.SriovCniCapabilities}},
 {{- end -}}
+{{- if .pKeyConfigured -}}
+  "pkey":{{.pKey}},
+{{- end -}}
 {{- if .StateConfigured -}}
   "link_state":"{{.SriovCniState}}",
 {{- end -}}