mirror of https://github.com/k3s-io/k3s
Merge pull request #6439 from thomasferrandiz/log-kube-router-1.24
[Release 1.24] log kube-router version when starting netpol controllerpull/6446/head
commit
8eb4bc589b
|
@ -8,9 +8,12 @@ package netpol
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
|
"github.com/cloudnativelabs/kube-router/pkg/version"
|
||||||
|
|
||||||
"github.com/cloudnativelabs/kube-router/pkg/controllers/netpol"
|
"github.com/cloudnativelabs/kube-router/pkg/controllers/netpol"
|
||||||
"github.com/cloudnativelabs/kube-router/pkg/healthcheck"
|
"github.com/cloudnativelabs/kube-router/pkg/healthcheck"
|
||||||
"github.com/cloudnativelabs/kube-router/pkg/options"
|
"github.com/cloudnativelabs/kube-router/pkg/options"
|
||||||
|
@ -131,7 +134,7 @@ func Run(ctx context.Context, nodeConfig *config.Node) error {
|
||||||
npInformer.AddEventHandler(npc.NetworkPolicyEventHandler)
|
npInformer.AddEventHandler(npc.NetworkPolicyEventHandler)
|
||||||
|
|
||||||
wg.Add(1)
|
wg.Add(1)
|
||||||
logrus.Info("Starting the netpol controller")
|
logrus.Infof("Starting the netpol controller version %s, built on %s, %s", version.Version, version.BuildDate, runtime.Version())
|
||||||
go npc.Run(healthCh, stopCh, &wg)
|
go npc.Run(healthCh, stopCh, &wg)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
|
@ -14,6 +14,7 @@ PKG_CRICTL="github.com/kubernetes-sigs/cri-tools/pkg"
|
||||||
PKG_K8S_BASE="k8s.io/component-base"
|
PKG_K8S_BASE="k8s.io/component-base"
|
||||||
PKG_K8S_CLIENT="k8s.io/client-go/pkg"
|
PKG_K8S_CLIENT="k8s.io/client-go/pkg"
|
||||||
PKG_CNI_PLUGINS="github.com/containernetworking/plugins"
|
PKG_CNI_PLUGINS="github.com/containernetworking/plugins"
|
||||||
|
PKG_KUBE_ROUTER="github.com/cloudnativelabs/kube-router"
|
||||||
|
|
||||||
buildDate=$(date -u '+%Y-%m-%dT%H:%M:%SZ')
|
buildDate=$(date -u '+%Y-%m-%dT%H:%M:%SZ')
|
||||||
|
|
||||||
|
@ -41,6 +42,9 @@ VERSIONFLAGS="
|
||||||
-X ${PKG_CNI_PLUGINS}/plugins/meta/flannel.Version=${VERSION_FLANNEL}
|
-X ${PKG_CNI_PLUGINS}/plugins/meta/flannel.Version=${VERSION_FLANNEL}
|
||||||
-X ${PKG_CNI_PLUGINS}/plugins/meta/flannel.Commit=${COMMIT}
|
-X ${PKG_CNI_PLUGINS}/plugins/meta/flannel.Commit=${COMMIT}
|
||||||
-X ${PKG_CNI_PLUGINS}/plugins/meta/flannel.buildDate=${buildDate}
|
-X ${PKG_CNI_PLUGINS}/plugins/meta/flannel.buildDate=${buildDate}
|
||||||
|
|
||||||
|
-X ${PKG_KUBE_ROUTER}/pkg/version.Version=${VERSION_KUBE_ROUTER}
|
||||||
|
-X ${PKG_KUBE_ROUTER}/pkg/version.BuildDate=${buildDate}
|
||||||
"
|
"
|
||||||
|
|
||||||
if [ -n "${DEBUG}" ]; then
|
if [ -n "${DEBUG}" ]; then
|
||||||
|
|
|
@ -48,6 +48,11 @@ fi
|
||||||
|
|
||||||
VERSION_CNIPLUGINS="v1.1.1-k3s1"
|
VERSION_CNIPLUGINS="v1.1.1-k3s1"
|
||||||
|
|
||||||
|
VERSION_KUBE_ROUTER=$(grep github.com/k3s-io/kube-router go.mod | head -n1 | awk '{print $4}')
|
||||||
|
if [ -z "$VERSION_KUBE_ROUTER" ]; then
|
||||||
|
VERSION_KUBE_ROUTER="v0.0.0"
|
||||||
|
fi
|
||||||
|
|
||||||
VERSION_ROOT="v0.11.0"
|
VERSION_ROOT="v0.11.0"
|
||||||
|
|
||||||
if [[ -n "$GIT_TAG" ]]; then
|
if [[ -n "$GIT_TAG" ]]; then
|
||||||
|
|
Loading…
Reference in New Issue