Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cmd/interlink/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ func main() {
mutex.HandleFunc("/pinglink", interLinkAPIs.Ping)
mutex.HandleFunc("/getLogs", interLinkAPIs.GetLogsHandler)
mutex.HandleFunc("/updateCache", interLinkAPIs.UpdateCacheHandler)
mutex.HandleFunc("/version", api.VersionHandler(interlink.Version))

interLinkEndpoint := ""
switch {
Expand Down
5 changes: 5 additions & 0 deletions cmd/virtual-kubelet/set-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,9 @@ var (
KubeletVersion = "$KUBELET_VERSION"
)
EOF
cat << EOF > pkg/interlink/version.go
package interlink

var Version = "$KUBELET_VERSION"
EOF
fi
24 changes: 24 additions & 0 deletions pkg/interlink/api/version.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package api

import (
"encoding/json"
"net/http"
)

// VersionHandler reports the version of the running interLink server.
func VersionHandler(version string) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodGet {
w.Header().Set("Allow", http.MethodGet)
w.WriteHeader(http.StatusMethodNotAllowed)
return
}

w.Header().Set("Content-Type", "application/json")
if err := json.NewEncoder(w).Encode(struct {
Version string `json:"version"`
}{Version: version}); err != nil {
return
}
}
}
30 changes: 30 additions & 0 deletions pkg/interlink/api/version_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package api

import (
"net/http"
"net/http/httptest"
"testing"

"github.com/stretchr/testify/require"
)

func TestVersionHandlerReturnsRunningVersion(t *testing.T) {
recorder := httptest.NewRecorder()
request := httptest.NewRequest(http.MethodGet, "/version", nil)

VersionHandler("1.2.3").ServeHTTP(recorder, request)

require.Equal(t, http.StatusOK, recorder.Code)
require.Equal(t, "application/json", recorder.Header().Get("Content-Type"))
require.JSONEq(t, `{"version":"1.2.3"}`, recorder.Body.String())
}

func TestVersionHandlerRejectsNonGetRequests(t *testing.T) {
recorder := httptest.NewRecorder()
request := httptest.NewRequest(http.MethodPost, "/version", nil)

VersionHandler("1.2.3").ServeHTTP(recorder, request)

require.Equal(t, http.StatusMethodNotAllowed, recorder.Code)
require.Equal(t, http.MethodGet, recorder.Header().Get("Allow"))
}
4 changes: 4 additions & 0 deletions pkg/interlink/version.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package interlink

// Version is the version of the running interLink server.
var Version = "test"
Loading