From 697962534c5052fb168f3cb4200d1d4e5bb4101c Mon Sep 17 00:00:00 2001 From: Harsh Jha <49128964+harshcommits@users.noreply.github.com> Date: Mon, 28 Nov 2022 08:31:44 +0530 Subject: [PATCH] Dockerfile update (#44) Co-authored-by: Harsh --- Dockerfile | 8 +++++--- Makefile | 2 +- .../templates/_helpers.tpl | 2 +- go.mod | 1 - go.sum | 2 -- hack/hook-me.sh | 2 +- pkg/apis/config/v1alpha1/zz_generated.conversion.go | 3 ++- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 103c294..e6ae0f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,16 @@ ############# builder -FROM golang:1.18 AS builder +FROM golang:1.19.1 AS builder -WORKDIR /go/src/github.com/ujwaliyer/gardener-extension-provider-dns-infoblox +WORKDIR /go/src/gardener-extension-provider-dns-infoblox COPY . . +RUN go mod tidy && go mod vendor +RUN chmod -R 777 vendor/ RUN make install ############# base image FROM alpine:3.13.7 AS base -############# gardener-extension-provider-dns-cloudflare +############# gardener-extension-provider-dns-infoblox FROM base AS gardener-extension-provider-dns-infoblox COPY charts /charts diff --git a/Makefile b/Makefile index dfcd958..b43aaef 100644 --- a/Makefile +++ b/Makefile @@ -107,7 +107,7 @@ check: .PHONY: check-docforge check-docforge: $(DOCFORGE) - @$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/check-docforge.sh $(REPO_ROOT) $(REPO_ROOT)/.docforge/manifest.yaml ".docforge/;docs/" "gardener-extension-provider-dns-cloudflare" false + @$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/check-docforge.sh $(REPO_ROOT) $(REPO_ROOT)/.docforge/manifest.yaml ".docforge/;docs/" "gardener-extension-provider-dns-infoblox" false .PHONY: generate generate: diff --git a/charts/gardener-extension-provider-dns-infoblox/templates/_helpers.tpl b/charts/gardener-extension-provider-dns-infoblox/templates/_helpers.tpl index bb680b1..941f169 100644 --- a/charts/gardener-extension-provider-dns-infoblox/templates/_helpers.tpl +++ b/charts/gardener-extension-provider-dns-infoblox/templates/_helpers.tpl @@ -1,5 +1,5 @@ {{- define "name" -}} -gardener-extension-provider-dns-cloudflare +gardener-extension-provider-dns-infoblox {{- end -}} {{- define "labels.app.key" -}} diff --git a/go.mod b/go.mod index cb0127d..641cbae 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,6 @@ require ( github.com/infobloxopen/infoblox-go-client/v2 v2.1.1 github.com/onsi/ginkgo/v2 v2.1.6 github.com/onsi/gomega v1.20.1 - github.com/schrodit/gardener-extension-provider-dns-cloudflare v0.0.2 github.com/spf13/cobra v1.2.1 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.13.0 diff --git a/go.sum b/go.sum index 7a23c70..a1ab084 100644 --- a/go.sum +++ b/go.sum @@ -689,8 +689,6 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/schrodit/gardener-extension-provider-dns-cloudflare v0.0.2 h1:/9nkqrfKO8OP2eIOZqtzDR2dk/FEJtOe9udQGH5bApk= -github.com/schrodit/gardener-extension-provider-dns-cloudflare v0.0.2/go.mod h1:MQAYH192DEZwOJEKqEWxo3x4bJf81rykyk2cf4sAurY= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= diff --git a/hack/hook-me.sh b/hack/hook-me.sh index 132345f..4df50b4 100644 --- a/hack/hook-me.sh +++ b/hack/hook-me.sh @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -./vendor/github.com/gardener/gardener/hack/hook-me.sh cloudflare-dns $@ +./vendor/github.com/gardener/gardener/hack/hook-me.sh infoblox-dns $@ diff --git a/pkg/apis/config/v1alpha1/zz_generated.conversion.go b/pkg/apis/config/v1alpha1/zz_generated.conversion.go index bf6de41..09ccd20 100644 --- a/pkg/apis/config/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/config/v1alpha1/zz_generated.conversion.go @@ -24,7 +24,8 @@ package v1alpha1 import ( unsafe "unsafe" - config "github.com/schrodit/gardener-extension-provider-dns-cloudflare/pkg/apis/config" + + config "github.com/ujwaliyer/gardener-extension-provider-dns-infoblox/pkg/apis/config" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" componentbaseconfig "k8s.io/component-base/config"