Merge branch 'spectro-master' into PCP-2370

Dockerfile

@@ -1,4 +1,9 @@
 # syntax=docker/dockerfile:experimental
+ARG BUILDER_GOLANG_VERSION
+# First stage: build the executable.
+FROM --platform=$TARGETPLATFORM gcr.io/spectro-images-public/golang:${BUILDER_GOLANG_VERSION}-alpine as dev
+# FIPS
+ARG CRYPTO_LIB
 
 ARG BUILDER_GOLANG_VERSION
 # First stage: build the executable.

Makefile

@@ -16,9 +16,20 @@ ifeq ($(FIPS_ENABLE),yes)
  RELEASE_LOC := release-fips
 endif
 
+# Fips Flags
+FIPS_ENABLE ?= ""
+
+BUILDER_GOLANG_VERSION ?= 1.21
+BUILD_ARGS = --build-arg CRYPTO_LIB=${FIPS_ENABLE} --build-arg BUILDER_GOLANG_VERSION=${BUILDER_GOLANG_VERSION}
+
+RELEASE_LOC := release
+ifeq ($(FIPS_ENABLE),yes)
+ CGO_ENABLED := 1
+ RELEASE_LOC := release-fips
+endif
+
 # These will be provided to the target
 VERSION := v0.6.4
-
 SPECTRO_VERSION ?= 4.0.0-dev
 BUILD := `git rev-parse HEAD`
 
@@ -41,6 +52,14 @@ IMG ?= ${REGISTRY}/${IMAGE_NAME}:${IMG_TAG}
 RELEASE_REGISTRY := gcr.io/spectro-images-public/release/kube-vip
 RELEASE_CONTROLLER_IMG := $(RELEASE_REGISTRY)/$(IMAGE_NAME)
 
+IMAGE_NAME := kube-vip
+REGISTRY ?= gcr.io/spectro-dev-public/$(USER)/${RELEASE_LOC}
+IMG_TAG ?= v0.4.0-spectro-${SPECTRO_VERSION}
+IMG ?= ${REGISTRY}/${IMAGE_NAME}:${IMG_TAG}
+
+RELEASE_REGISTRY := gcr.io/spectro-images-public/release/kube-vip
+RELEASE_CONTROLLER_IMG := $(RELEASE_REGISTRY)/$(IMAGE_NAME)
+
 .PHONY: all build clean install uninstall fmt simplify check run e2e-tests
 
 all: check install
@@ -85,7 +104,12 @@ dockerx86Iptables:
 
 dockerx86:
  @-rm ./kube-vip
- @docker buildx build --platform linux/amd64 --push -t $(REPOSITORY)/$(TARGET):$(DOCKERTAG) .
+ @docker buildx build --platform linux/amd64 --push -t ${IMG} .
+ @echo New single x86 Architecture Docker image created
+
+release-dockerx86:
+ @-rm ./kube-vip
+ @docker buildx build --platform linux/amd64 --push -t ${RELEASE_CONTROLLER_IMG} .
  @echo New single x86 Architecture Docker image created
 
 docker:

go.sum

@@ -423,7 +423,6 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl
 golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
 golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=

pkg/vip/ddns.go

@@ -44,6 +44,10 @@ func (ddns *ddnsManager) Start() (string, error) {
 
  go client.Start()
 
+ client.WithHostName(ddns.network.DDNSHostName())
+
+ go client.Start()
+
  log.Info("waiting for ip from dhcp")
  ip, timeout := "", time.After(1*time.Minute)