Skip to content

Commit bd6fc92

Browse files
stefanprodanstefanprodan
authored
Merge pull request #473 from fluxcd/go-v1.17
Update Go to v1.17
2 parents 1475eca + 22d0880 commit bd6fc92

File tree

11 files changed

+928
-456
lines changed

11 files changed

+928
-456
lines changed

‎.github/actions/run-tests/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG BASE_VARIANT=bullseye
2-
ARG GO_VERSION=1.16.12
2+
ARG GO_VERSION=1.17.5
33
ARG XX_VERSION=1.1.0
44

55
ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2

‎Dockerfile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
ARG BASE_VARIANT=bullseye
2-
ARG GO_VERSION=1.16.12
3-
ARG GO_LATEST=1.17.5
2+
ARG GO_VERSION=1.17
43
ARG XX_VERSION=1.1.0
54

65
ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2
@@ -10,7 +9,6 @@ FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
109
FROM ${LIBGIT2_IMG}:${LIBGIT2_TAG} as libgit2
1110

1211
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} as gostable
13-
FROM --platform=$BUILDPLATFORM golang:${GO_LATEST}-${BASE_VARIANT} AS golatest
1412

1513
FROM gostable AS go-linux
1614

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ endif
4747

4848

4949
# API (doc) generation utilities
50-
CONTROLLER_GEN_VERSION ?= v0.5.0
50+
CONTROLLER_GEN_VERSION ?= v0.7.0
5151
GEN_API_REF_DOCS_VERSION ?= v0.3.0
5252

5353
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)

‎api/go.mod‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
11
module github.com/fluxcd/source-controller/api
22

3-
go 1.16
3+
go 1.17
44

55
require (
6-
github.com/fluxcd/pkg/apis/acl v0.0.1
7-
github.com/fluxcd/pkg/apis/meta v0.10.1
8-
k8s.io/apimachinery v0.22.2
9-
sigs.k8s.io/controller-runtime v0.10.2
6+
github.com/fluxcd/pkg/apis/acl v0.0.3
7+
github.com/fluxcd/pkg/apis/meta v0.10.2
8+
k8s.io/apimachinery v0.23.1
9+
sigs.k8s.io/controller-runtime v0.11.0
10+
)
11+
12+
require (
13+
github.com/go-logr/logr v1.2.2 // indirect
14+
github.com/gogo/protobuf v1.3.2 // indirect
15+
github.com/google/go-cmp v0.5.6 // indirect
16+
github.com/google/gofuzz v1.2.0 // indirect
17+
github.com/json-iterator/go v1.1.12 // indirect
18+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
19+
github.com/modern-go/reflect2 v1.0.2 // indirect
20+
golang.org/x/net v0.0.0-20211215060638-4ddde0e984e9 // indirect
21+
golang.org/x/text v0.3.7 // indirect
22+
gopkg.in/inf.v0 v0.9.1 // indirect
23+
gopkg.in/yaml.v2 v2.4.0 // indirect
24+
k8s.io/klog/v2 v2.30.0 // indirect
25+
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 // indirect
26+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
27+
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
1028
)

‎api/go.sum‎

Lines changed: 236 additions & 65 deletions
Large diffs are not rendered by default.

‎controllers/bucket_controller.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"strings"
2626
"time"
2727

28-
"github.com/go-logr/logr"
2928
"github.com/minio/minio-go/v7"
3029
"github.com/minio/minio-go/v7/pkg/credentials"
3130
"github.com/minio/minio-go/v7/pkg/s3utils"
@@ -268,7 +267,7 @@ func (r *BucketReconciler) reconcileDelete(ctx context.Context, bucket sourcev1.
268267
// reconcileWithGCP handles getting objects from a Google Cloud Platform bucket
269268
// using a gcp client
270269
func (r *BucketReconciler) reconcileWithGCP(ctx context.Context, bucket sourcev1.Bucket, tempDir string) (sourcev1.Bucket, error) {
271-
log := logr.FromContext(ctx)
270+
log := ctrl.LoggerFrom(ctx)
272271
gcpClient, err := r.authGCP(ctx, bucket)
273272
if err != nil {
274273
err = fmt.Errorf("auth error: %w", err)
@@ -534,7 +533,7 @@ func (r *BucketReconciler) gc(bucket sourcev1.Bucket) error {
534533

535534
// event emits a Kubernetes event and forwards the event to notification controller if configured
536535
func (r *BucketReconciler) event(ctx context.Context, bucket sourcev1.Bucket, severity, msg string) {
537-
log := logr.FromContext(ctx)
536+
log := ctrl.LoggerFrom(ctx)
538537
if r.EventRecorder != nil {
539538
r.EventRecorder.Eventf(&bucket, "Normal", severity, msg)
540539
}
@@ -553,7 +552,7 @@ func (r *BucketReconciler) event(ctx context.Context, bucket sourcev1.Bucket, se
553552
}
554553

555554
func (r *BucketReconciler) recordReadiness(ctx context.Context, bucket sourcev1.Bucket) {
556-
log := logr.FromContext(ctx)
555+
log := ctrl.LoggerFrom(ctx)
557556
if r.MetricsRecorder == nil {
558557
return
559558
}
@@ -576,7 +575,7 @@ func (r *BucketReconciler) recordSuspension(ctx context.Context, bucket sourcev1
576575
if r.MetricsRecorder == nil {
577576
return
578577
}
579-
log := logr.FromContext(ctx)
578+
log := ctrl.LoggerFrom(ctx)
580579

581580
objRef, err := reference.GetReference(r.Scheme, &bucket)
582581
if err != nil {

‎controllers/gitrepository_controller.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"time"
2626

2727
securejoin "github.com/cyphar/filepath-securejoin"
28-
"github.com/go-logr/logr"
2928
corev1 "k8s.io/api/core/v1"
3029
apimeta "k8s.io/apimachinery/pkg/api/meta"
3130
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -89,7 +88,7 @@ func (r *GitRepositoryReconciler) SetupWithManagerAndOptions(mgr ctrl.Manager, o
8988

9089
func (r *GitRepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
9190
start := time.Now()
92-
log := logr.FromContext(ctx)
91+
log := ctrl.LoggerFrom(ctx)
9392

9493
var repository sourcev1.GitRepository
9594
if err := r.Get(ctx, req.NamespacedName, &repository); err != nil {
@@ -417,7 +416,7 @@ func (r *GitRepositoryReconciler) gc(repository sourcev1.GitRepository) error {
417416

418417
// event emits a Kubernetes event and forwards the event to notification controller if configured
419418
func (r *GitRepositoryReconciler) event(ctx context.Context, repository sourcev1.GitRepository, severity, msg string) {
420-
log := logr.FromContext(ctx)
419+
log := ctrl.LoggerFrom(ctx)
421420

422421
if r.EventRecorder != nil {
423422
r.EventRecorder.Eventf(&repository, "Normal", severity, msg)
@@ -437,7 +436,7 @@ func (r *GitRepositoryReconciler) event(ctx context.Context, repository sourcev1
437436
}
438437

439438
func (r *GitRepositoryReconciler) recordReadiness(ctx context.Context, repository sourcev1.GitRepository) {
440-
log := logr.FromContext(ctx)
439+
log := ctrl.LoggerFrom(ctx)
441440
if r.MetricsRecorder == nil {
442441
return
443442
}
@@ -460,7 +459,7 @@ func (r *GitRepositoryReconciler) recordSuspension(ctx context.Context, gitrepos
460459
if r.MetricsRecorder == nil {
461460
return
462461
}
463-
log := logr.FromContext(ctx)
462+
log := ctrl.LoggerFrom(ctx)
464463

465464
objRef, err := reference.GetReference(r.Scheme, &gitrepository)
466465
if err != nil {

‎controllers/helmchart_controller.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"time"
2929

3030
securejoin "github.com/cyphar/filepath-securejoin"
31-
"github.com/go-logr/logr"
3231
helmgetter "helm.sh/helm/v3/pkg/getter"
3332
corev1 "k8s.io/api/core/v1"
3433
apierrs "k8s.io/apimachinery/pkg/api/errors"
@@ -115,7 +114,7 @@ func (r *HelmChartReconciler) SetupWithManagerAndOptions(mgr ctrl.Manager, opts
115114

116115
func (r *HelmChartReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
117116
start := time.Now()
118-
log := logr.FromContext(ctx)
117+
log := ctrl.LoggerFrom(ctx)
119118

120119
var chart sourcev1.HelmChart
121120
if err := r.Get(ctx, req.NamespacedName, &chart); err != nil {
@@ -630,7 +629,7 @@ func (r *HelmChartReconciler) gc(chart sourcev1.HelmChart) error {
630629
// event emits a Kubernetes event and forwards the event to notification
631630
// controller if configured.
632631
func (r *HelmChartReconciler) event(ctx context.Context, chart sourcev1.HelmChart, severity, msg string) {
633-
log := logr.FromContext(ctx)
632+
log := ctrl.LoggerFrom(ctx)
634633
if r.EventRecorder != nil {
635634
r.EventRecorder.Eventf(&chart, "Normal", severity, msg)
636635
}
@@ -649,7 +648,7 @@ func (r *HelmChartReconciler) event(ctx context.Context, chart sourcev1.HelmChar
649648
}
650649

651650
func (r *HelmChartReconciler) recordReadiness(ctx context.Context, chart sourcev1.HelmChart) {
652-
log := logr.FromContext(ctx)
651+
log := ctrl.LoggerFrom(ctx)
653652
if r.MetricsRecorder == nil {
654653
return
655654
}
@@ -825,7 +824,7 @@ func (r *HelmChartReconciler) recordSuspension(ctx context.Context, chart source
825824
if r.MetricsRecorder == nil {
826825
return
827826
}
828-
log := logr.FromContext(ctx)
827+
log := ctrl.LoggerFrom(ctx)
829828

830829
objRef, err := reference.GetReference(r.Scheme, &chart)
831830
if err != nil {

‎controllers/helmrepository_controller.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"os"
2424
"time"
2525

26-
"github.com/go-logr/logr"
2726
helmgetter "helm.sh/helm/v3/pkg/getter"
2827
corev1 "k8s.io/api/core/v1"
2928
apimeta "k8s.io/apimachinery/pkg/api/meta"
@@ -82,7 +81,7 @@ func (r *HelmRepositoryReconciler) SetupWithManagerAndOptions(mgr ctrl.Manager,
8281

8382
func (r *HelmRepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
8483
start := time.Now()
85-
log := logr.FromContext(ctx)
84+
log := ctrl.LoggerFrom(ctx)
8685

8786
var repository sourcev1.HelmRepository
8887
if err := r.Get(ctx, req.NamespacedName, &repository); err != nil {
@@ -330,7 +329,7 @@ func (r *HelmRepositoryReconciler) gc(repository sourcev1.HelmRepository) error
330329

331330
// event emits a Kubernetes event and forwards the event to notification controller if configured
332331
func (r *HelmRepositoryReconciler) event(ctx context.Context, repository sourcev1.HelmRepository, severity, msg string) {
333-
log := logr.FromContext(ctx)
332+
log := ctrl.LoggerFrom(ctx)
334333
if r.EventRecorder != nil {
335334
r.EventRecorder.Eventf(&repository, "Normal", severity, msg)
336335
}
@@ -349,7 +348,7 @@ func (r *HelmRepositoryReconciler) event(ctx context.Context, repository sourcev
349348
}
350349

351350
func (r *HelmRepositoryReconciler) recordReadiness(ctx context.Context, repository sourcev1.HelmRepository) {
352-
log := logr.FromContext(ctx)
351+
log := ctrl.LoggerFrom(ctx)
353352
if r.MetricsRecorder == nil {
354353
return
355354
}
@@ -384,7 +383,7 @@ func (r *HelmRepositoryReconciler) recordSuspension(ctx context.Context, hr sour
384383
if r.MetricsRecorder == nil {
385384
return
386385
}
387-
log := logr.FromContext(ctx)
386+
log := ctrl.LoggerFrom(ctx)
388387

389388
objRef, err := reference.GetReference(r.Scheme, &hr)
390389
if err != nil {

0 commit comments

Comments
 (0)