Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vendor [email protected] and Upgrade k8s dependencies and controller-runtime #148

Merged
merged 7 commits into from
Mar 1, 2023
Merged

Vendor [email protected] and Upgrade k8s dependencies and controller-runtime #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5aab951
Vendor `[email protected]`
shafeeqes Mar 1, 2023
438bb81
Set job name for prometheus
shafeeqes Mar 1, 2023
659506f
Adapt `imagevector.Read` function
shafeeqes Mar 1, 2023
dfb71de
Run `make format`
shafeeqes Mar 1, 2023
6c666e5
Run `make generate`
shafeeqes Mar 1, 2023
a1a1a30
Remove MR health check for `ShootSystemComponentsHealthy` condition
shafeeqes Mar 1, 2023
4700ffb
Run `make generate`
shafeeqes Mar 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,10 @@ check: $(GOIMPORTS) $(GOLANGCI_LINT) $(HELM)
.PHONY: generate
generate: $(CONTROLLER_GEN) $(GEN_CRD_API_REFERENCE_DOCS) $(HELM) $(MOCKGEN)
@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/generate.sh ./charts/... ./cmd/... ./pkg/... ./test/...
$(MAKE) format

.PHONY: format
format: $(GOIMPORTS)
format: $(GOIMPORTS) $(GOIMPORTSREVISER)
@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/format.sh ./cmd ./pkg ./test

.PHONY: test
Expand Down
6 changes: 6 additions & 0 deletions charts/gardener-extension-shoot-cert-service/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ spec:
{{- if .Values.imageVectorOverwrite }}
checksum/configmap-extension-imagevector-overwrite: {{ include (print $.Template.BasePath "/configmap-imagevector-overwrite.yaml") . | sha256sum }}
{{- end }}
{{- if and .Values.metrics.enableScraping }}
prometheus.io/name: {{ .Release.Name }}
prometheus.io/scrape: "true"
# default metrics endpoint in controller-runtime
prometheus.io/port: {{ .Values.metrics.port }}
{{- end }}
labels:
app.kubernetes.io/name: gardener-extension-shoot-cert-service
app.kubernetes.io/instance: {{ .Release.Name }}
Expand Down
6 changes: 6 additions & 0 deletions charts/gardener-extension-shoot-cert-service/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ image:
leaderElection:
resourceLock: leases

# settings for metrics, e.g. scraping by seed-prometheus
metrics:
enableScraping: true
# default metrics endpoint in controller-runtime
port: 8080

resources: {}

vpa:
Expand Down
8 changes: 4 additions & 4 deletions cmd/gardener-extension-shoot-cert-service/app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ import (
"context"
"fmt"

serviceinstall "github.com/gardener/gardener-extension-shoot-cert-service/pkg/apis/service/install"
"github.com/gardener/gardener-extension-shoot-cert-service/pkg/controller"
"github.com/gardener/gardener-extension-shoot-cert-service/pkg/controller/healthcheck"

certv1alpha1 "github.com/gardener/cert-management/pkg/apis/cert/v1alpha1"
extensionscontroller "github.com/gardener/gardener/extensions/pkg/controller"
"github.com/gardener/gardener/extensions/pkg/controller/heartbeat"
Expand All @@ -31,6 +27,10 @@ import (
componentbaseconfig "k8s.io/component-base/config"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/manager"

serviceinstall "github.com/gardener/gardener-extension-shoot-cert-service/pkg/apis/service/install"
"github.com/gardener/gardener-extension-shoot-cert-service/pkg/controller"
"github.com/gardener/gardener-extension-shoot-cert-service/pkg/controller/healthcheck"
)

// NewServiceControllerCommand creates a new command that is used to start the Certificate Service controller.
Expand Down
6 changes: 3 additions & 3 deletions cmd/gardener-extension-shoot-cert-service/app/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ package app
import (
"os"

certificateservicecmd "github.com/gardener/gardener-extension-shoot-cert-service/pkg/cmd"
heartbeatcmd "github.com/gardener/gardener/extensions/pkg/controller/heartbeat/cmd"

controllercmd "github.com/gardener/gardener/extensions/pkg/controller/cmd"
heartbeatcmd "github.com/gardener/gardener/extensions/pkg/controller/heartbeat/cmd"
"k8s.io/client-go/tools/leaderelection/resourcelock"

certificateservicecmd "github.com/gardener/gardener-extension-shoot-cert-service/pkg/cmd"
)

// ExtensionName is the name of the extension.
Expand Down
4 changes: 2 additions & 2 deletions cmd/gardener-extension-shoot-cert-service/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ package main
import (
"os"

"github.com/gardener/gardener-extension-shoot-cert-service/cmd/gardener-extension-shoot-cert-service/app"

"github.com/gardener/gardener/pkg/logger"
runtimelog "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager/signals"

"github.com/gardener/gardener-extension-shoot-cert-service/cmd/gardener-extension-shoot-cert-service/app"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion example/controller-registration.yaml
View file
Open in desktop

Large diffs are not rendered by default.

43 changes: 22 additions & 21 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ go 1.19
require (
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
github.com/gardener/cert-management v0.10.1
github.com/gardener/gardener v1.62.2
github.com/gardener/gardener v1.65.0
github.com/go-logr/logr v1.2.3
github.com/golang/mock v1.6.0
github.com/onsi/ginkgo/v2 v2.6.1
github.com/onsi/gomega v1.24.2
github.com/spf13/cobra v1.6.1
github.com/spf13/pflag v1.0.5
golang.org/x/tools v0.4.0
k8s.io/api v0.26.0
k8s.io/apimachinery v0.26.0
k8s.io/api v0.26.1
k8s.io/apimachinery v0.26.1
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/code-generator v0.26.0
k8s.io/component-base v0.26.0
k8s.io/code-generator v0.26.1
k8s.io/component-base v0.26.1
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
sigs.k8s.io/controller-runtime v0.13.1
sigs.k8s.io/controller-runtime v0.14.4
)

require (
Expand All @@ -37,8 +37,9 @@ require (
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/frankban/quicktest v1.14.4 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gardener/etcd-druid v0.15.0 // indirect
github.com/gardener/etcd-druid v0.15.3 // indirect
github.com/gardener/hvpa-controller/api v0.5.0 // indirect
github.com/gardener/machine-controller-manager v0.45.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
Expand Down Expand Up @@ -66,7 +67,6 @@ require (
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kr/pretty v0.3.0 // indirect
github.com/kubernetes-csi/external-snapshotter/v2 v2.1.4 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
Expand Down Expand Up @@ -101,14 +101,14 @@ require (
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.7.0 // indirect
go.uber.org/zap v1.21.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/mod v0.7.0 // indirect
golang.org/x/net v0.5.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/oauth2 v0.4.0 // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/term v0.4.0 // indirect
golang.org/x/text v0.6.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
Expand All @@ -120,21 +120,22 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
istio.io/api v0.0.0-20221013011440-bc935762d2b9 // indirect
istio.io/client-go v1.15.3 // indirect
k8s.io/apiextensions-apiserver v0.26.0 // indirect
k8s.io/apiserver v0.26.0 // indirect
k8s.io/autoscaler/vertical-pod-autoscaler v0.12.0 // indirect
k8s.io/apiextensions-apiserver v0.26.1 // indirect
k8s.io/apiserver v0.26.1 // indirect
k8s.io/autoscaler/vertical-pod-autoscaler v0.13.0 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/helm v2.16.1+incompatible // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-aggregator v0.26.0 // indirect
k8s.io/kube-aggregator v0.26.1 // indirect
k8s.io/kube-openapi v0.0.0-20221207184640-f3cff1453715 // indirect
k8s.io/metrics v0.25.0 // indirect
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220706173534-cd0058ad295c // indirect
sigs.k8s.io/controller-tools v0.11.1 // indirect
k8s.io/kubelet v0.26.1 // indirect
k8s.io/metrics v0.26.1 // indirect
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20221212190805-d4f1e822ca11 // indirect
sigs.k8s.io/controller-tools v0.11.3 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace k8s.io/client-go => k8s.io/client-go v0.25.4
replace k8s.io/client-go => k8s.io/client-go v0.26.1
Loading