Skip to content

Commit

Permalink
return the embedded cluster version with the node join response (#4470)
Browse files Browse the repository at this point in the history
* return the embedded cluster version with the node join response

* rename to embeddedClusterVersion
  • Loading branch information
laverya committed Feb 26, 2024
1 parent caae2e9 commit a34e1cb
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion pkg/handlers/embedded_cluster_node_join_command.go
Expand Up @@ -23,6 +23,7 @@ type GetEmbeddedClusterNodeJoinCommandResponse struct {
K0sUnsupportedOverrides string `json:"k0sUnsupportedOverrides"`
EndUserK0sConfigOverrides string `json:"endUserK0sConfigOverrides"`
MetricsBaseURL string `json:"metricsBaseURL"`
EmbeddedClusterVersion string `json:"embeddedClusterVersion"`
}

type GenerateEmbeddedClusterNodeJoinCommandRequest struct {
Expand Down Expand Up @@ -142,9 +143,10 @@ func (h *Handler) GetEmbeddedClusterNodeJoinCommand(w http.ResponseWriter, r *ht
return
}
endUserK0sConfigOverrides := install.Spec.EndUserK0sConfigOverrides
var k0sUnsupportedOverrides string
var k0sUnsupportedOverrides, ecVersion string
if install.Spec.Config != nil {
k0sUnsupportedOverrides = install.Spec.Config.UnsupportedOverrides.K0s
ecVersion = install.Spec.Config.Version
}

JSON(w, http.StatusOK, GetEmbeddedClusterNodeJoinCommandResponse{
Expand All @@ -154,5 +156,6 @@ func (h *Handler) GetEmbeddedClusterNodeJoinCommand(w http.ResponseWriter, r *ht
K0sUnsupportedOverrides: k0sUnsupportedOverrides,
EndUserK0sConfigOverrides: endUserK0sConfigOverrides,
MetricsBaseURL: install.Spec.MetricsBaseURL,
EmbeddedClusterVersion: ecVersion,
})
}

0 comments on commit a34e1cb

Please sign in to comment.