Skip to content

Commit 452922a

Browse files
phlogistonjohnphlogistonjohn
committed
Merge branch 'master' into release
2 parents 6c5af55 + d3873ad commit 452922a

File tree

12 files changed

+58
-40
lines changed

12 files changed

+58
-40
lines changed

‎.github/workflows/main.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/setup-go@v3
14+
- uses: actions/setup-go@v5
1515
with:
1616
go-version: oldstable
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- name: Build
1919
run: make
2020
# Run static/code-quality checks
2121
check:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/setup-go@v3
24+
- uses: actions/setup-go@v5
2525
with:
2626
go-version: oldstable
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828
- name: Install revive
2929
run: go install github.com/mgechev/revive@latest
3030
- name: Run checks
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: ubuntu-latest
3434
if: github.event_name == 'pull_request'
3535
steps:
36-
- uses: actions/checkout@v3
36+
- uses: actions/checkout@v4
3737
with:
3838
fetch-depth: 0
3939
ref: ${{ github.event.pull_request.head.sha }}
@@ -44,10 +44,10 @@ jobs:
4444
test:
4545
runs-on: ubuntu-latest
4646
steps:
47-
- uses: actions/setup-go@v3
47+
- uses: actions/setup-go@v5
4848
with:
4949
go-version: oldstable
50-
- uses: actions/checkout@v3
50+
- uses: actions/checkout@v4
5151
- name: run the tests
5252
run: make test
5353
podmanbuild:
@@ -56,7 +56,7 @@ jobs:
5656
# image build step, so no need to do it twice.
5757
if: github.event_name == 'pull_request'
5858
steps:
59-
- uses: actions/checkout@v3
59+
- uses: actions/checkout@v4
6060
- name: Install fuse-overlayfs
6161
run: sudo apt-get -y install fuse-overlayfs
6262
- name: Setup podman config
@@ -84,7 +84,7 @@ jobs:
8484
# image build step, so no need to do it twice.
8585
if: github.event_name == 'pull_request'
8686
steps:
87-
- uses: actions/checkout@v3
87+
- uses: actions/checkout@v4
8888
- name: build container image
8989
# note: forcing use of podman here since we are
9090
# using podman explicitly for the push job
@@ -97,8 +97,8 @@ jobs:
9797
CONTAINER_CMD: docker
9898
PR_NUM: ${{ github.event.pull_request.number }}
9999
steps:
100-
- uses: actions/checkout@v3
101-
- uses: actions/setup-go@v3
100+
- uses: actions/checkout@v4
101+
- uses: actions/setup-go@v5
102102
with:
103103
go-version: oldstable
104104
- name: Install k3d
@@ -152,7 +152,7 @@ jobs:
152152
runs-on: ubuntu-latest
153153
if: github.event_name == 'push'
154154
steps:
155-
- uses: actions/checkout@v3
155+
- uses: actions/checkout@v4
156156
- name: log in to quay.io
157157
# using docker for now, since podman has an issue with space
158158
# consumption: image build fails with no space left on device...

‎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 docker.io/golang:1.20 as builder
2+
FROM docker.io/golang:1.21 as builder
33
ARG GIT_VERSION="(unset)"
44
ARG COMMIT_ID="(unset)"
55
ARG ARCH=""

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ TAG?=latest
3838
IMG?=quay.io/samba.org/samba-operator:$(TAG)
3939

4040
# Produce CRDs that work on Kubernetes 1.16 or later
41-
CRD_OPTIONS?="crd:trivialVersions=true,crdVersions=v1"
41+
CRD_OPTIONS?="crd:crdVersions=v1"
4242

4343
CHECK_GOFMT_FLAGS?=-e -s -l
4444

‎api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/manager-full/auth_proxy_patch.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ metadata:
88
spec:
99
template:
1010
spec:
11+
affinity:
12+
nodeAffinity:
13+
requiredDuringSchedulingIgnoredDuringExecution:
14+
nodeSelectorTerms:
15+
- matchExpressions:
16+
- key: kubernetes.io/arch
17+
operator: In
18+
values:
19+
- amd64
1120
containers:
1221
- name: kube-rbac-proxy
1322
# this is apparently the same code as

‎config/manager/manager.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@ spec:
3131
kubectl.kubernetes.io/default-logs-container: manager
3232
kubectl.kubernetes.io/default-container: manager
3333
spec:
34+
affinity:
35+
nodeAffinity:
36+
requiredDuringSchedulingIgnoredDuringExecution:
37+
nodeSelectorTerms:
38+
- matchExpressions:
39+
- key: kubernetes.io/arch
40+
operator: In
41+
values:
42+
- amd64
3443
containers:
3544
- command:
3645
- /manager

‎go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ require (
5959
go.uber.org/atomic v1.7.0 // indirect
6060
go.uber.org/multierr v1.6.0 // indirect
6161
go.uber.org/zap v1.24.0 // indirect
62-
golang.org/x/net v0.17.0 // indirect
62+
golang.org/x/net v0.23.0 // indirect
6363
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
64-
golang.org/x/sys v0.13.0 // indirect
65-
golang.org/x/term v0.13.0 // indirect
66-
golang.org/x/text v0.13.0 // indirect
64+
golang.org/x/sys v0.18.0 // indirect
65+
golang.org/x/term v0.18.0 // indirect
66+
golang.org/x/text v0.14.0 // indirect
6767
golang.org/x/time v0.3.0 // indirect
6868
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
6969
google.golang.org/appengine v1.6.7 // indirect
70-
google.golang.org/protobuf v1.28.1 // indirect
70+
google.golang.org/protobuf v1.33.0 // indirect
7171
gopkg.in/inf.v0 v0.9.1 // indirect
7272
gopkg.in/ini.v1 v1.51.0 // indirect
7373
gopkg.in/yaml.v2 v2.4.0 // indirect

‎go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -618,8 +618,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
618618
golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
619619
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
620620
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
621-
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
622-
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
621+
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
622+
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
623623
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
624624
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
625625
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -689,12 +689,12 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
689689
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
690690
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
691691
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
692-
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
693-
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
692+
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
693+
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
694694
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
695695
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
696-
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
697-
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
696+
golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
697+
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
698698
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
699699
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
700700
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -703,8 +703,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
703703
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
704704
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
705705
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
706-
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
707-
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
706+
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
707+
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
708708
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
709709
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
710710
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -848,8 +848,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
848848
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
849849
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
850850
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
851-
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
852-
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
851+
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
852+
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
853853
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
854854
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
855855
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎hack/install-tools.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ _install_kustomize() {
3636
}
3737

3838
_install_controller_gen() {
39-
_install_tool sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.2
39+
_install_tool sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
4040
}
4141

4242
_install_revive() {
43-
_install_tool github.com/mgechev/revive@v1.2.3
43+
_install_tool github.com/mgechev/revive@v1.3.7
4444
}
4545

4646
_install_golangci_lint() {

‎internal/resources/smbshare_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func TestTransferOwnership(t *testing.T) {
162162
ts := metav1.Now()
163163
s3.SetDeletionTimestamp(&ts)
164164
m.client.(*fakeClient).clientGet = func(
165-
ctx context.Context,
165+
_ context.Context,
166166
nn types.NamespacedName,
167167
obj rtclient.Object) error {
168168
// ---
@@ -198,9 +198,9 @@ func TestTransferOwnership(t *testing.T) {
198198
assert.True(t, changed)
199199

200200
m.client.(*fakeClient).clientGet = func(
201-
ctx context.Context,
202-
nn types.NamespacedName,
203-
obj rtclient.Object) error {
201+
_ context.Context,
202+
_ types.NamespacedName,
203+
_ rtclient.Object) error {
204204
// ---
205205
return fmt.Errorf("wild failure")
206206
}

0 commit comments

Comments
 (0)