Skip to content

Commit 8959125

Browse files
authored
refactor(scmconnection): use custom annotation to reconcile on secret ref changes (#2506)
1 parent 76493d5 commit 8959125

File tree

13 files changed

+336
-133
lines changed

13 files changed

+336
-133
lines changed
11 Bytes
Binary file not shown.
5 Bytes
Binary file not shown.
-2 Bytes
Binary file not shown.
4 Bytes
Binary file not shown.

go/controller/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.23.7 AS builder
2+
FROM golang:1.24 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

go/controller/api/v1alpha1/scmconnection_types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ import (
44
"context"
55
"fmt"
66

7-
console "github.com/pluralsh/console/go/client"
87
corev1 "k8s.io/api/core/v1"
98
"k8s.io/apimachinery/pkg/api/meta"
109
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1110
"sigs.k8s.io/controller-runtime/pkg/client"
11+
12+
console "github.com/pluralsh/console/go/client"
1213
)
1314

1415
func init() {

go/controller/config/rbac/role.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ rules:
2222
- get
2323
- list
2424
- patch
25+
- update
2526
- watch
2627
- apiGroups:
2728
- deployments.plural.sh

go/controller/go.mod

Lines changed: 54 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,70 @@
11
module github.com/pluralsh/console/go/controller
22

3-
go 1.23.4
3+
go 1.24.0
44

55
require (
66
github.com/Masterminds/sprig/v3 v3.3.0
77
github.com/Yamashou/gqlgenc v0.29.0
88
github.com/go-logr/logr v1.4.2
9-
github.com/onsi/ginkgo/v2 v2.22.1
10-
github.com/onsi/gomega v1.36.2
9+
github.com/onsi/ginkgo/v2 v2.23.3
10+
github.com/onsi/gomega v1.36.3
1111
github.com/orcaman/concurrent-map/v2 v2.0.1
1212
github.com/pluralsh/console/go/client v1.48.0
1313
github.com/pluralsh/polly v0.2.0
1414
github.com/samber/lo v1.49.1
1515
github.com/stretchr/testify v1.10.0
1616
github.com/vektah/gqlparser/v2 v2.5.22
1717
golang.org/x/time v0.10.0
18-
k8s.io/api v0.32.1
19-
k8s.io/apimachinery v0.32.1
20-
k8s.io/client-go v0.32.1
18+
k8s.io/api v0.33.3
19+
k8s.io/apimachinery v0.33.3
20+
k8s.io/client-go v0.33.3
2121
k8s.io/klog/v2 v2.130.1
22-
sigs.k8s.io/cluster-api v1.9.4
23-
sigs.k8s.io/controller-runtime v0.19.4
22+
sigs.k8s.io/cluster-api v1.10.4
23+
sigs.k8s.io/controller-runtime v0.21.0
2424
sigs.k8s.io/yaml v1.4.0
2525
)
2626

2727
require (
28+
cel.dev/expr v0.19.1 // indirect
2829
dario.cat/mergo v1.0.1 // indirect
2930
github.com/99designs/gqlgen v0.17.64 // indirect
31+
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3032
github.com/Masterminds/goutils v1.1.1 // indirect
3133
github.com/Masterminds/semver/v3 v3.3.1 // indirect
32-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
34+
github.com/NYTimes/gziphandler v1.1.1 // indirect
35+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
3336
github.com/beorn7/perks v1.0.1 // indirect
3437
github.com/blang/semver/v4 v4.0.0 // indirect
3538
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
39+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3640
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3741
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
38-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
42+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
3943
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
44+
github.com/felixge/httpsnoop v1.0.4 // indirect
4045
github.com/fsnotify/fsnotify v1.8.0 // indirect
4146
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
47+
github.com/go-logr/stdr v1.2.2 // indirect
4248
github.com/go-logr/zapr v1.3.0 // indirect
4349
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4450
github.com/go-openapi/jsonreference v0.21.0 // indirect
4551
github.com/go-openapi/swag v0.23.0 // indirect
4652
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4753
github.com/gobuffalo/flect v1.0.3 // indirect
4854
github.com/gogo/protobuf v1.3.2 // indirect
49-
github.com/golang/protobuf v1.5.4 // indirect
55+
github.com/google/btree v1.1.3 // indirect
56+
github.com/google/cel-go v0.23.2 // indirect
5057
github.com/google/gnostic-models v0.6.9 // indirect
51-
github.com/google/go-cmp v0.6.0 // indirect
58+
github.com/google/go-cmp v0.7.0 // indirect
5259
github.com/google/gofuzz v1.2.0 // indirect
5360
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
5461
github.com/google/uuid v1.6.0 // indirect
62+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
5563
github.com/huandu/xstrings v1.5.0 // indirect
64+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5665
github.com/josharian/intern v1.0.0 // indirect
5766
github.com/json-iterator/go v1.1.12 // indirect
58-
github.com/klauspost/compress v1.17.11 // indirect
67+
github.com/kylelemons/godebug v1.1.0 // indirect
5968
github.com/mailru/easyjson v0.9.0 // indirect
6069
github.com/mitchellh/copystructure v1.2.0 // indirect
6170
github.com/mitchellh/reflectwalk v1.0.2 // indirect
@@ -66,37 +75,58 @@ require (
6675
github.com/osteele/tuesday v1.0.3 // indirect
6776
github.com/pkg/errors v0.9.1 // indirect
6877
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
69-
github.com/prometheus/client_golang v1.20.5 // indirect
78+
github.com/prometheus/client_golang v1.22.0 // indirect
7079
github.com/prometheus/client_model v0.6.1 // indirect
7180
github.com/prometheus/common v0.62.0 // indirect
7281
github.com/prometheus/procfs v0.15.1 // indirect
7382
github.com/shopspring/decimal v1.4.0 // indirect
7483
github.com/sosodev/duration v1.3.1 // indirect
7584
github.com/spf13/cast v1.7.1 // indirect
85+
github.com/spf13/cobra v1.9.1 // indirect
7686
github.com/spf13/pflag v1.0.6 // indirect
87+
github.com/stoewer/go-strcase v1.3.0 // indirect
7788
github.com/stretchr/objx v0.5.2 // indirect
89+
github.com/valyala/fastjson v1.6.4 // indirect
7890
github.com/x448/float16 v0.8.4 // indirect
91+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
92+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
93+
go.opentelemetry.io/otel v1.33.0 // indirect
94+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
95+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
96+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
97+
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
98+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
99+
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
79100
go.uber.org/multierr v1.11.0 // indirect
80101
go.uber.org/zap v1.27.0 // indirect
81-
golang.org/x/crypto v0.33.0 // indirect
102+
golang.org/x/crypto v0.36.0 // indirect
82103
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
83-
golang.org/x/net v0.35.0 // indirect
84-
golang.org/x/oauth2 v0.26.0 // indirect
85-
golang.org/x/sys v0.30.0 // indirect
86-
golang.org/x/term v0.29.0 // indirect
87-
golang.org/x/text v0.22.0 // indirect
104+
golang.org/x/net v0.38.0 // indirect
105+
golang.org/x/oauth2 v0.28.0 // indirect
106+
golang.org/x/sync v0.12.0 // indirect
107+
golang.org/x/sys v0.31.0 // indirect
108+
golang.org/x/term v0.30.0 // indirect
109+
golang.org/x/text v0.23.0 // indirect
88110
golang.org/x/tools v0.30.0 // indirect
89-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
111+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
112+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
113+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
114+
google.golang.org/grpc v1.68.1 // indirect
90115
google.golang.org/protobuf v1.36.5 // indirect
91116
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
92117
gopkg.in/inf.v0 v0.9.1 // indirect
93118
gopkg.in/yaml.v2 v2.4.0 // indirect
94119
gopkg.in/yaml.v3 v3.0.1 // indirect
95-
k8s.io/apiextensions-apiserver v0.32.1 // indirect
96-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
120+
k8s.io/apiextensions-apiserver v0.33.0 // indirect
121+
k8s.io/apiserver v0.33.0 // indirect
122+
k8s.io/cluster-bootstrap v0.32.3 // indirect
123+
k8s.io/component-base v0.33.0 // indirect
124+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
97125
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
126+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
98127
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
99-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
128+
sigs.k8s.io/randfill v1.0.0 // indirect
129+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
100130
)
101131

102132
replace github.com/pluralsh/console/go/client => ../client

0 commit comments

Comments
 (0)