Skip to content

Commit 231e207

Browse files
afritzlerafritzler
authored
Update license ref in readme (#443)
Update license ref in readme and other project housekeeping changes.
1 parent f441258 commit 231e207

File tree

5 files changed

+55
-40
lines changed

5 files changed

+55
-40
lines changed

‎.github/dependabot.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ updates:
55
directory: "/"
66
schedule:
77
interval: "weekly"
8-
reviewers:
9-
- "ironcore-dev/core"
108
# Ignore K8 packages as these are done manually
119
ignore:
1210
- dependency-name: "k8s.io/api"
@@ -22,5 +20,3 @@ updates:
2220
directory: "/"
2321
schedule:
2422
interval: "weekly"
25-
reviewers:
26-
- "ironcore-dev/core"

‎Makefile‎

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ vet: ## Run go vet against code.
3737
go vet ./...
3838

3939
.PHONY: lint
40-
lint: golangci-lint ## Run golangci-lint on the code.
41-
$(GOLANGCILINT) run ./...
40+
lint: golangci-lint ## Run golangci-lint linter
41+
$(GOLANGCI_LINT) run
4242

4343
.PHONY: check-license
4444
check-license: addlicense ## Check that every file has a license header present.
@@ -69,30 +69,46 @@ $(LOCALBIN):
6969
ADDLICENSE ?= $(LOCALBIN)/addlicense
7070
GOIMPORTS ?= $(LOCALBIN)/goimports
7171
MOCKGEN ?= $(LOCALBIN)/mockgen
72-
GOLANGCILINT ?= $(LOCALBIN)/golangci-lint
72+
GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
7373

7474
## Tool Versions
7575
ADDLICENSE_VERSION ?= v1.1.1
76-
GOIMPORTS_VERSION ?= v0.31.0
76+
GOIMPORTS_VERSION ?= v0.34.0
7777
MOCKGEN_VERSION ?= v0.5.2
78-
GOLANGCILINT_VERSION ?= v2.1
78+
GOLANGCI_LINT_VERSION ?= v2.1
7979

8080
.PHONY: addlicense
8181
addlicense: $(ADDLICENSE) ## Download addlicense locally if necessary.
8282
$(ADDLICENSE): $(LOCALBIN)
83-
test -s $(LOCALBIN)/addlicense || GOBIN=$(LOCALBIN) go install github.com/google/addlicense@$(ADDLICENSE_VERSION)
83+
$(call go-install-tool,$(ADDLICENSE),github.com/google/addlicense,$(ADDLICENSE_VERSION))
8484

8585
.PHONY: goimports
8686
goimports: $(GOIMPORTS) ## Download goimports locally if necessary.
8787
$(GOIMPORTS): $(LOCALBIN)
88-
test -s $(LOCALBIN)/goimports || GOBIN=$(LOCALBIN) go install golang.org/x/tools/cmd/goimports@$(GOIMPORTS_VERSION)
88+
$(call go-install-tool,$(GOIMPORTS),golang.org/x/tools/cmd/goimports,$(GOIMPORTS_VERSION))
8989

9090
.PHONY: mockgen
9191
mockgen: $(MOCKGEN) ## Download mockgen locally if necessary.
9292
$(MOCKGEN): $(LOCALBIN)
93-
test -s $(LOCALBIN)/mockgen || GOBIN=$(LOCALBIN) go install go.uber.org/mock/mockgen@$(MOCKGEN_VERSION)
94-
95-
.PHONY: goimports
96-
golangci-lint: $(GOLANGCILINT) ## Download golangci-lint locally if necessary.
97-
$(GOLANGCILINT): $(LOCALBIN)
98-
test -s $(LOCALBIN)/golangci-lint || GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCILINT_VERSION)
93+
$(call go-install-tool,$(MOCKGEN),go.uber.org/mock/mockgen,$(MOCKGEN_VERSION))
94+
95+
.PHONY: golangci-lint
96+
golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
97+
$(GOLANGCI_LINT): $(LOCALBIN)
98+
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/v2/cmd/golangci-lint,${GOLANGCI_LINT_VERSION})
99+
100+
# go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist
101+
# $1 - target path with name of binary
102+
# $2 - package url which can be installed
103+
# $3 - specific version of package
104+
define go-install-tool
105+
@[ -f "$(1)-$(3)" ] || { \
106+
set -e; \
107+
package=$(2)@$(3) ;\
108+
echo "Downloading $${package}" ;\
109+
rm -f $(1) || true ;\
110+
GOBIN=$(LOCALBIN) go install $${package} ;\
111+
mv $(1) $(1)-$(3) ;\
112+
} ;\
113+
ln -sf $(1)-$(3) $(1)
114+
endef

‎README.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ To use the library in your project, just run
1919
go get github.com/ironcore-dev/controller-utils
2020
```
2121

22-
## License
22+
## Licensing
23+
24+
Copyright 2025 SAP SE or an SAP affiliate company and IronCore contributors. Please see our [LICENSE](LICENSE) for
25+
copyright and license information. Detailed information including third-party components and their licensing/copyright
26+
information is available [via the REUSE tool](https://api.reuse.software/info/github.com/ironcore-dev/controller-utils).
2327

24-
[Apache-2.0](LICENSE)

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ go 1.24.0
55
require (
66
github.com/onsi/ginkgo/v2 v2.23.4
77
github.com/onsi/gomega v1.37.0
8-
github.com/spf13/pflag v1.0.6
8+
github.com/spf13/pflag v1.0.7
99
github.com/stretchr/testify v1.10.0
1010
go.uber.org/mock v0.5.2
11-
k8s.io/api v0.33.1
12-
k8s.io/apiextensions-apiserver v0.33.1
13-
k8s.io/apimachinery v0.33.1
14-
k8s.io/apiserver v0.33.1
15-
k8s.io/client-go v0.33.1
11+
k8s.io/api v0.33.3
12+
k8s.io/apiextensions-apiserver v0.33.3
13+
k8s.io/apimachinery v0.33.3
14+
k8s.io/apiserver v0.33.3
15+
k8s.io/client-go v0.33.3
1616
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
1717
sigs.k8s.io/controller-runtime v0.21.0
1818
sigs.k8s.io/kustomize/api v0.20.0
@@ -90,7 +90,7 @@ require (
9090
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9191
gopkg.in/inf.v0 v0.9.1 // indirect
9292
gopkg.in/yaml.v3 v3.0.1 // indirect
93-
k8s.io/component-base v0.33.1 // indirect
93+
k8s.io/component-base v0.33.3 // indirect
9494
k8s.io/klog/v2 v2.130.1 // indirect
9595
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
9696
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 // indirect

‎go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR
109109
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
110110
github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
111111
github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
112-
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
113-
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
112+
github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
113+
github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
114114
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
115115
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
116116
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
@@ -219,18 +219,18 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
219219
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
220220
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
221221
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
222-
k8s.io/api v0.33.1 h1:tA6Cf3bHnLIrUK4IqEgb2v++/GYUtqiu9sRVk3iBXyw=
223-
k8s.io/api v0.33.1/go.mod h1:87esjTn9DRSRTD4fWMXamiXxJhpOIREjWOSjsW1kEHw=
224-
k8s.io/apiextensions-apiserver v0.33.1 h1:N7ccbSlRN6I2QBcXevB73PixX2dQNIW0ZRuguEE91zI=
225-
k8s.io/apiextensions-apiserver v0.33.1/go.mod h1:uNQ52z1A1Gu75QSa+pFK5bcXc4hq7lpOXbweZgi4dqA=
226-
k8s.io/apimachinery v0.33.1 h1:mzqXWV8tW9Rw4VeW9rEkqvnxj59k1ezDUl20tFK/oM4=
227-
k8s.io/apimachinery v0.33.1/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
228-
k8s.io/apiserver v0.33.1 h1:yLgLUPDVC6tHbNcw5uE9mo1T6ELhJj7B0geifra3Qdo=
229-
k8s.io/apiserver v0.33.1/go.mod h1:VMbE4ArWYLO01omz+k8hFjAdYfc3GVAYPrhP2tTKccs=
230-
k8s.io/client-go v0.33.1 h1:ZZV/Ks2g92cyxWkRRnfUDsnhNn28eFpt26aGc8KbXF4=
231-
k8s.io/client-go v0.33.1/go.mod h1:JAsUrl1ArO7uRVFWfcj6kOomSlCv+JpvIsp6usAGefA=
232-
k8s.io/component-base v0.33.1 h1:EoJ0xA+wr77T+G8p6T3l4efT2oNwbqBVKR71E0tBIaI=
233-
k8s.io/component-base v0.33.1/go.mod h1:guT/w/6piyPfTgq7gfvgetyXMIh10zuXA6cRRm3rDuY=
222+
k8s.io/api v0.33.3 h1:SRd5t//hhkI1buzxb288fy2xvjubstenEKL9K51KBI8=
223+
k8s.io/api v0.33.3/go.mod h1:01Y/iLUjNBM3TAvypct7DIj0M0NIZc+PzAHCIo0CYGE=
224+
k8s.io/apiextensions-apiserver v0.33.3 h1:qmOcAHN6DjfD0v9kxL5udB27SRP6SG/MTopmge3MwEs=
225+
k8s.io/apiextensions-apiserver v0.33.3/go.mod h1:oROuctgo27mUsyp9+Obahos6CWcMISSAPzQ77CAQGz8=
226+
k8s.io/apimachinery v0.33.3 h1:4ZSrmNa0c/ZpZJhAgRdcsFcZOw1PQU1bALVQ0B3I5LA=
227+
k8s.io/apimachinery v0.33.3/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
228+
k8s.io/apiserver v0.33.3 h1:Wv0hGc+QFdMJB4ZSiHrCgN3zL3QRatu56+rpccKC3J4=
229+
k8s.io/apiserver v0.33.3/go.mod h1:05632ifFEe6TxwjdAIrwINHWE2hLwyADFk5mBsQa15E=
230+
k8s.io/client-go v0.33.3 h1:M5AfDnKfYmVJif92ngN532gFqakcGi6RvaOF16efrpA=
231+
k8s.io/client-go v0.33.3/go.mod h1:luqKBQggEf3shbxHY4uVENAxrDISLOarxpTKMiUuujg=
232+
k8s.io/component-base v0.33.3 h1:mlAuyJqyPlKZM7FyaoM/LcunZaaY353RXiOd2+B5tGA=
233+
k8s.io/component-base v0.33.3/go.mod h1:ktBVsBzkI3imDuxYXmVxZ2zxJnYTZ4HAsVj9iF09qp4=
234234
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
235235
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
236236
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=

0 commit comments

Comments
 (0)