mirror of
https://github.com/ysoftdevs/gardener-extension-shoot-fleet-agent.git
synced 2026-01-11 22:41:09 +01:00
Update dependencies
This commit is contained in:
Martin Šalata
1
.gitignore
vendored
1
.gitignore
vendored
@@ -5,6 +5,7 @@
|
||||
/local
|
||||
**/dev
|
||||
/bin
|
||||
./vendor
|
||||
|
||||
*.coverprofile
|
||||
*.html
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
############# builder
|
||||
FROM eu.gcr.io/gardener-project/3rd/golang:1.15.5 AS builder
|
||||
FROM golang:1.17.10 AS builder
|
||||
|
||||
WORKDIR /go/src/github.com/gardener/gardener-extension-shoot-fleet-agent
|
||||
COPY . .
|
||||
RUN make install
|
||||
|
||||
############# gardener-extension-shoot-fleet-agent
|
||||
FROM eu.gcr.io/gardener-project/3rd/alpine:3.12.3 AS gardener-extension-shoot-fleet-agent
|
||||
FROM alpine:3.15.4 AS gardener-extension-shoot-fleet-agent
|
||||
|
||||
COPY charts /charts
|
||||
COPY --from=builder /go/bin/gardener-extension-shoot-fleet-agent /gardener-extension-shoot-fleet-agent
|
||||
|
||||
17
Makefile
17
Makefile
@@ -59,6 +59,23 @@ docker-images:
|
||||
docker-push:
|
||||
@docker push $(IMAGE_PREFIX)-$(NAME):$(VERSION)
|
||||
|
||||
#######################################################
|
||||
# Rules related to Containerd image build and release #
|
||||
#######################################################
|
||||
|
||||
.PHONY: containerd-login
|
||||
containerd-login:
|
||||
@echo "$(DOCKER_PASS)" | nerdctl login -u "$(DOCKER_USER)" --password-stdin
|
||||
|
||||
.PHONY: containerd-images
|
||||
containerd-images:
|
||||
@nerdctl build -t $(IMAGE_PREFIX)-$(NAME):$(VERSION) -f Dockerfile -m 6g --target $(EXTENSION_PREFIX)-$(NAME) .
|
||||
@nerdctl build -t $(IMAGE_PREFIX)-$(NAME):latest -f Dockerfile -m 6g --target $(EXTENSION_PREFIX)-$(NAME) .
|
||||
|
||||
.PHONY: containerd-push
|
||||
containerd-push:
|
||||
@nerdctl push $(IMAGE_PREFIX)-$(NAME):$(VERSION)
|
||||
|
||||
#####################################################################
|
||||
# Rules for verification, formatting, linting, testing and cleaning #
|
||||
#####################################################################
|
||||
|
||||
@@ -16,18 +16,19 @@ package main
|
||||
|
||||
import (
|
||||
"github.com/javamachr/gardener-extension-shoot-fleet-agent/cmd/gardener-extension-shoot-fleet-agent/app"
|
||||
"os"
|
||||
|
||||
controllercmd "github.com/gardener/gardener/extensions/pkg/controller/cmd"
|
||||
"github.com/gardener/gardener/extensions/pkg/log"
|
||||
"github.com/gardener/gardener/pkg/logger"
|
||||
runtimelog "sigs.k8s.io/controller-runtime/pkg/log"
|
||||
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
|
||||
)
|
||||
|
||||
func main() {
|
||||
runtimelog.SetLogger(log.ZapLogger(false))
|
||||
runtimelog.SetLogger(logger.ZapLogger(false))
|
||||
|
||||
ctx := signals.SetupSignalHandler()
|
||||
if err := app.NewServiceControllerCommand().ExecuteContext(ctx); err != nil {
|
||||
controllercmd.LogErrAndExit(err, "error executing the main controller command")
|
||||
runtimelog.Log.Error(err, "error executing the main controller command")
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
170
go.mod
170
go.mod
@@ -1,46 +1,144 @@
|
||||
module github.com/javamachr/gardener-extension-shoot-fleet-agent
|
||||
|
||||
go 1.15
|
||||
go 1.17
|
||||
|
||||
require (
|
||||
github.com/ahmetb/gen-crd-api-reference-docs v0.2.0
|
||||
github.com/gardener/etcd-druid v0.3.0 // indirect
|
||||
github.com/gardener/gardener v1.15.1-0.20210115062544-6dc08568692a
|
||||
github.com/go-logr/logr v0.3.0
|
||||
github.com/gobuffalo/packr/v2 v2.8.1
|
||||
github.com/golang/mock v1.4.4-0.20200731163441-8734ec565a4d
|
||||
github.com/karrick/godirwalk v1.16.1 // indirect
|
||||
github.com/nwaples/rardecode v1.1.0 // indirect
|
||||
github.com/onsi/ginkgo v1.14.1
|
||||
github.com/onsi/gomega v1.10.2 // indirect
|
||||
github.com/pierrec/lz4 v2.5.2+incompatible // indirect
|
||||
github.com/pkg/errors v0.9.1 // indirect
|
||||
github.com/rancher/fleet/pkg/apis v0.0.0-20200909045814-3675caaa7070
|
||||
github.com/rogpeppe/go-internal v1.7.0 // indirect
|
||||
github.com/sirupsen/logrus v1.7.0 // indirect
|
||||
github.com/spf13/cobra v1.1.1
|
||||
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
|
||||
github.com/gardener/gardener v1.47.1
|
||||
github.com/go-logr/logr v1.2.3
|
||||
github.com/gobuffalo/packr/v2 v2.8.3
|
||||
github.com/golang/mock v1.6.0
|
||||
github.com/onsi/ginkgo v1.16.5
|
||||
github.com/rancher/fleet/pkg/apis v0.0.0-20220601092642-d45a36738d27
|
||||
github.com/spf13/cobra v1.4.0
|
||||
github.com/spf13/pflag v1.0.5
|
||||
github.com/ulikunitz/xz v0.5.7 // indirect
|
||||
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
|
||||
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect
|
||||
golang.org/x/sys v0.0.0-20210123111255-9b0068b26619 // indirect
|
||||
golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect
|
||||
golang.org/x/tools v0.1.0 // indirect
|
||||
k8s.io/api v0.19.6
|
||||
k8s.io/apimachinery v0.19.6
|
||||
k8s.io/api v0.24.0
|
||||
k8s.io/apimachinery v0.24.0
|
||||
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
|
||||
k8s.io/code-generator v0.19.6
|
||||
k8s.io/component-base v0.19.6
|
||||
k8s.io/utils v0.0.0-20200912215256-4140de9c8800 // indirect
|
||||
sigs.k8s.io/controller-runtime v0.7.1
|
||||
k8s.io/code-generator v0.24.0
|
||||
k8s.io/component-base v0.24.0
|
||||
sigs.k8s.io/controller-runtime v0.11.2
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/BurntSushi/toml v0.3.1 // indirect
|
||||
github.com/Masterminds/goutils v1.1.1 // indirect
|
||||
github.com/Masterminds/semver v1.5.0 // indirect
|
||||
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
|
||||
github.com/PuerkitoBio/purell v1.1.1 // indirect
|
||||
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
|
||||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
github.com/bronze1man/yaml2json v0.0.0-20211227013850-8972abeaea25 // indirect
|
||||
github.com/cespare/xxhash/v2 v2.1.2 // indirect
|
||||
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/emicklei/go-restful v2.9.6+incompatible // indirect
|
||||
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
|
||||
github.com/fatih/color v1.13.0 // indirect
|
||||
github.com/fsnotify/fsnotify v1.5.1 // indirect
|
||||
github.com/gardener/etcd-druid v0.8.0 // indirect
|
||||
github.com/gardener/external-dns-management v0.7.18 // indirect
|
||||
github.com/gardener/hvpa-controller/api v0.5.0 // indirect
|
||||
github.com/ghodss/yaml v1.0.0 // indirect
|
||||
github.com/go-logr/zapr v1.2.0 // indirect
|
||||
github.com/go-openapi/jsonpointer v0.19.5 // indirect
|
||||
github.com/go-openapi/jsonreference v0.19.5 // indirect
|
||||
github.com/go-openapi/swag v0.19.14 // indirect
|
||||
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
|
||||
github.com/gobuffalo/flect v0.2.3 // indirect
|
||||
github.com/gobuffalo/logger v1.0.6 // indirect
|
||||
github.com/gobuffalo/packd v1.0.1 // indirect
|
||||
github.com/gobwas/glob v0.2.3 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
|
||||
github.com/golang/protobuf v1.5.2 // indirect
|
||||
github.com/google/go-cmp v0.5.7 // indirect
|
||||
github.com/google/gofuzz v1.1.0 // indirect
|
||||
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
|
||||
github.com/google/uuid v1.1.2 // indirect
|
||||
github.com/googleapis/gnostic v0.5.5 // indirect
|
||||
github.com/hashicorp/errwrap v1.0.0 // indirect
|
||||
github.com/hashicorp/go-multierror v1.1.1 // indirect
|
||||
github.com/huandu/xstrings v1.3.2 // indirect
|
||||
github.com/imdario/mergo v0.3.12 // indirect
|
||||
github.com/inconshreveable/mousetrap v1.0.0 // indirect
|
||||
github.com/josharian/intern v1.0.0 // indirect
|
||||
github.com/json-iterator/go v1.1.12 // indirect
|
||||
github.com/karrick/godirwalk v1.16.1 // indirect
|
||||
github.com/kubernetes-csi/external-snapshotter/v2 v2.1.4 // indirect
|
||||
github.com/mailru/easyjson v0.7.6 // indirect
|
||||
github.com/markbates/errx v1.1.0 // indirect
|
||||
github.com/markbates/oncer v1.0.0 // indirect
|
||||
github.com/markbates/safe v1.0.1 // indirect
|
||||
github.com/mattn/go-colorable v0.1.12 // indirect
|
||||
github.com/mattn/go-isatty v0.0.14 // indirect
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
|
||||
github.com/mitchellh/copystructure v1.2.0 // indirect
|
||||
github.com/mitchellh/reflectwalk v1.0.2 // indirect
|
||||
github.com/moby/spdystream v0.2.0 // indirect
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
||||
github.com/modern-go/reflect2 v1.0.2 // indirect
|
||||
github.com/nxadm/tail v1.4.8 // indirect
|
||||
github.com/onsi/ginkgo/v2 v2.1.4 // indirect
|
||||
github.com/pkg/errors v0.9.1 // indirect
|
||||
github.com/prometheus/client_golang v1.12.1 // indirect
|
||||
github.com/prometheus/client_model v0.2.0 // indirect
|
||||
github.com/prometheus/common v0.32.1 // indirect
|
||||
github.com/prometheus/procfs v0.7.3 // indirect
|
||||
github.com/rancher/wrangler v0.6.2-0.20200829053106-7e1dd4260224 // indirect
|
||||
github.com/rogpeppe/go-internal v1.8.0 // indirect
|
||||
github.com/russross/blackfriday/v2 v2.1.0 // indirect
|
||||
github.com/sirupsen/logrus v1.8.1 // indirect
|
||||
github.com/spf13/afero v1.8.2 // indirect
|
||||
go.uber.org/atomic v1.7.0 // indirect
|
||||
go.uber.org/multierr v1.6.0 // indirect
|
||||
go.uber.org/zap v1.21.0 // indirect
|
||||
golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8 // indirect
|
||||
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
|
||||
golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
|
||||
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
|
||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
|
||||
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
|
||||
golang.org/x/text v0.3.7 // indirect
|
||||
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
|
||||
golang.org/x/tools v0.1.10 // indirect
|
||||
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
|
||||
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
|
||||
google.golang.org/appengine v1.6.7 // indirect
|
||||
google.golang.org/protobuf v1.28.0 // indirect
|
||||
gopkg.in/inf.v0 v0.9.1 // indirect
|
||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
|
||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
|
||||
istio.io/api v0.0.0-20220304035241-8c47cbbea144 // indirect
|
||||
istio.io/client-go v1.12.5 // indirect
|
||||
istio.io/gogo-genproto v0.0.0-20210113155706-4daf5697332f // indirect
|
||||
k8s.io/apiextensions-apiserver v0.24.0 // indirect
|
||||
k8s.io/apiserver v0.24.0 // indirect
|
||||
k8s.io/autoscaler/vertical-pod-autoscaler v0.10.0 // indirect
|
||||
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
|
||||
k8s.io/helm v2.16.1+incompatible // indirect
|
||||
k8s.io/klog v1.0.0 // indirect
|
||||
k8s.io/klog/v2 v2.60.1 // indirect
|
||||
k8s.io/kube-aggregator v0.23.3 // indirect
|
||||
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
|
||||
k8s.io/metrics v0.23.3 // indirect
|
||||
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
|
||||
sigs.k8s.io/cli-utils v0.16.0 // indirect
|
||||
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220513175748-3f265c36d7bf // indirect
|
||||
sigs.k8s.io/controller-tools v0.8.0 // indirect
|
||||
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
|
||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
|
||||
sigs.k8s.io/yaml v1.3.0 // indirect
|
||||
)
|
||||
|
||||
replace (
|
||||
k8s.io/api => k8s.io/api v0.19.6
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.19.6
|
||||
k8s.io/apiserver => k8s.io/apiserver v0.19.6
|
||||
k8s.io/client-go => k8s.io/client-go v0.19.6
|
||||
k8s.io/code-generator => k8s.io/code-generator v0.19.6
|
||||
k8s.io/component-base => k8s.io/component-base v0.19.6
|
||||
k8s.io/helm => k8s.io/helm v2.13.1+incompatible
|
||||
k8s.io/api => k8s.io/api v0.23.5
|
||||
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.5
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.23.5
|
||||
k8s.io/apiserver => k8s.io/apiserver v0.23.5
|
||||
k8s.io/client-go => k8s.io/client-go v0.23.5
|
||||
k8s.io/code-generator => k8s.io/code-generator v0.23.5
|
||||
k8s.io/component-base => k8s.io/component-base v0.23.5
|
||||
)
|
||||
|
||||
@@ -31,10 +31,11 @@ import (
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/runtime/serializer"
|
||||
"k8s.io/client-go/rest"
|
||||
"k8s.io/client-go/util/retry"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
"sigs.k8s.io/controller-runtime/pkg/log"
|
||||
|
||||
gardencorev1beta1helper "github.com/gardener/gardener/pkg/apis/core/v1beta1/helper"
|
||||
|
||||
"github.com/gardener/gardener/extensions/pkg/controller"
|
||||
"github.com/gardener/gardener/extensions/pkg/controller/extension"
|
||||
"github.com/javamachr/gardener-extension-shoot-fleet-agent/pkg/controller/config"
|
||||
@@ -250,9 +251,11 @@ func prepareLabels(cluster *extensions.Cluster, serviceConfig projConfig.Project
|
||||
}
|
||||
|
||||
func (a *actuator) updateStatus(ctx context.Context, ex *extensionsv1alpha1.Extension) error {
|
||||
return controller.TryUpdateStatus(ctx, retry.DefaultBackoff, a.client, ex, func() error {
|
||||
return nil
|
||||
})
|
||||
statusUpdater := controller.NewStatusUpdater(a.logger)
|
||||
statusUpdater.InjectClient(a.client)
|
||||
operationType := gardencorev1beta1helper.ComputeOperationType(ex.ObjectMeta, ex.Status.LastOperation)
|
||||
err := statusUpdater.Success(ctx, ex, operationType, "Successfully reconciled Extension")
|
||||
return err
|
||||
}
|
||||
|
||||
func (a *actuator) getFleetManager(cluster *extensions.Cluster) *FleetManager {
|
||||
|
||||
Reference in New Issue
Block a user