Skip to content

Commit

Permalink
Merge pull request owncloud#776 from wkloucek/deps-update
Browse files Browse the repository at this point in the history 
update dependencies and kubernetes versions
  • Loading branch information
@wkloucek
wkloucek authored Oct 22, 2024
2 parents cb8b014 + 391e492 commit cbd38cf
Show file tree
Hide file tree
Showing 8 changed files with 80 additions and 27 deletions.
12 changes: 6 additions & 6 deletions .bingo/Variables.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,21 @@ $(GOMPLATE): $(BINGO_DIR)/gomplate.mod
@echo "(re)installing $(GOBIN)/gomplate-v3.11.8"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=gomplate.mod -o=$(GOBIN)/gomplate-v3.11.8 "github.com/hairyhenderson/gomplate/v3/cmd/gomplate"

HELM_DOCS := $(GOBIN)/helm-docs-v1.13.1
HELM_DOCS := $(GOBIN)/helm-docs-v1.14.2
$(HELM_DOCS): $(BINGO_DIR)/helm-docs.mod
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
@echo "(re)installing $(GOBIN)/helm-docs-v1.13.1"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=helm-docs.mod -o=$(GOBIN)/helm-docs-v1.13.1 "github.com/norwoodj/helm-docs/cmd/helm-docs"
@echo "(re)installing $(GOBIN)/helm-docs-v1.14.2"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=helm-docs.mod -o=$(GOBIN)/helm-docs-v1.14.2 "github.com/norwoodj/helm-docs/cmd/helm-docs"

KUBE_LINTER := $(GOBIN)/kube-linter-v0.6.8
$(KUBE_LINTER): $(BINGO_DIR)/kube-linter.mod
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
@echo "(re)installing $(GOBIN)/kube-linter-v0.6.8"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kube-linter.mod -o=$(GOBIN)/kube-linter-v0.6.8 "golang.stackrox.io/kube-linter/cmd/kube-linter"

KUBECONFORM := $(GOBIN)/kubeconform-v0.6.6
KUBECONFORM := $(GOBIN)/kubeconform-v0.6.7
$(KUBECONFORM): $(BINGO_DIR)/kubeconform.mod
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
@echo "(re)installing $(GOBIN)/kubeconform-v0.6.6"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kubeconform.mod -o=$(GOBIN)/kubeconform-v0.6.6 "github.com/yannh/kubeconform/cmd/kubeconform"
@echo "(re)installing $(GOBIN)/kubeconform-v0.6.7"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kubeconform.mod -o=$(GOBIN)/kubeconform-v0.6.7 "github.com/yannh/kubeconform/cmd/kubeconform"

6 changes: 3 additions & 3 deletions .bingo/helm-docs.mod
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

go 1.22
go 1.22.0

toolchain go1.22.0
toolchain go1.23.1

require github.com/norwoodj/helm-docs v1.13.1 // cmd/helm-docs
require github.com/norwoodj/helm-docs v1.14.2 // cmd/helm-docs
48 changes: 48 additions & 0 deletions .bingo/helm-docs.sum
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .bingo/kubeconform.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ go 1.22

toolchain go1.22.3

require github.com/yannh/kubeconform v0.6.6 // cmd/kubeconform
require github.com/yannh/kubeconform v0.6.7 // cmd/kubeconform
6 changes: 6 additions & 0 deletions .bingo/kubeconform.sum
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
github.com/santhosh-tekuri/jsonschema/v5 v5.1.1 h1:lEOLY2vyGIqKWUI9nzsOJRV3mb3WC9dXYORsLEUcoeY=
github.com/santhosh-tekuri/jsonschema/v5 v5.1.1/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0=
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4=
Expand All @@ -19,6 +23,8 @@ github.com/yannh/kubeconform v0.6.4 h1:P8cQpK+K35qv8JOcjHQcTvD80SwwSDgHfMXyXrZ4r
github.com/yannh/kubeconform v0.6.4/go.mod h1:vl5ZLUE6h0xRd2qB0Drv9cc9sjZnjDYjSaexbfNE9WM=
github.com/yannh/kubeconform v0.6.6 h1:2v0IKk4YCos7SMHZRkEC0D+wfcpW4aEEKy9BWJEkyV0=
github.com/yannh/kubeconform v0.6.6/go.mod h1:cxRqUWj9Rd7rkPgaAoB0jHY6TjkI7c1GLyhul2Dwz3U=
github.com/yannh/kubeconform v0.6.7 h1:kIvjeiMSU0+/GY48+U9GmJZdGmoej4dArYvv3BfvlyA=
github.com/yannh/kubeconform v0.6.7/go.mod h1:lcx9py+svwYnKXiy146zVstEToiTuTu4rMzdXXfsyVc=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
Expand Down
4 changes: 2 additions & 2 deletions .bingo/variables.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ BINGO="${GOBIN}/bingo-v0.9.0"

GOMPLATE="${GOBIN}/gomplate-v3.11.8"

HELM_DOCS="${GOBIN}/helm-docs-v1.13.1"
HELM_DOCS="${GOBIN}/helm-docs-v1.14.2"

KUBE_LINTER="${GOBIN}/kube-linter-v0.6.8"

KUBECONFORM="${GOBIN}/kubeconform-v0.6.6"
KUBECONFORM="${GOBIN}/kubeconform-v0.6.7"

6 changes: 3 additions & 3 deletions .drone.star
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ config = {
# if this changes, also tested versions in need to be changed here:
# - Makefile
"kubernetesVersions": [
"1.27.0",
"1.28.0",
"1.29.0",
"1.30.0",
"1.31.0",
],
}

Expand Down Expand Up @@ -115,7 +115,7 @@ def documentation(ctx):
"steps": [
{
"name": "helm-docs-readme",
"image": "jnorwood/helm-docs:v1.13.1",
"image": "jnorwood/helm-docs:v1.14.2",
"entrypoint": [
"/usr/bin/helm-docs",
"--template-files=README.md.gotmpl",
Expand All @@ -124,7 +124,7 @@ def documentation(ctx):
},
{
"name": "helm-docs-values-table-adoc",
"image": "jnorwood/helm-docs:v1.13.1",
"image": "jnorwood/helm-docs:v1.14.2",
"entrypoint": [
"/usr/bin/helm-docs",
"--template-files=charts/ocis/docs/templates/values-desc-table.adoc.gotmpl",
Expand Down
23 changes: 11 additions & 12 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,7 @@ lint: $(KUBE_LINTER)


.PHONY: api
api: api-1.27.0 api-1.28.0 api-1.29.0 api-1.30.0

.PHONY: api-1.27.0
api-1.27.0: api-1.27.0-template api-1.27.0-kubeconform

.PHONY: api-1.27.0-template
api-1.27.0-template:
helm template --kube-version 1.27.0 charts/ocis -f 'charts/ocis/ci/values.yaml' > charts/ocis/ci/templated.yaml

.PHONY: api-1.27.0-kubeconform
api-1.27.0-kubeconform: $(KUBECONFORM)
$(KUBECONFORM) -kubernetes-version 1.27.0 -summary -strict charts/ocis/ci/templated.yaml
api: api-1.28.0 api-1.29.0 api-1.30.0 api-1.31.0

.PHONY: api-1.28.0
api-1.28.0: api-1.28.0-template api-1.28.0-kubeconform
Expand Down Expand Up @@ -69,6 +58,16 @@ api-1.30.0-template:
api-1.30.0-kubeconform: $(KUBECONFORM)
$(KUBECONFORM) -kubernetes-version 1.30.0 -summary -strict charts/ocis/ci/templated.yaml

.PHONY: api-1.31.0
api-1.31.0: api-1.31.0-template api-1.31.0-kubeconform

.PHONY: api-1.31.0-template
api-1.31.0-template:
helm template --kube-version 1.31.0 charts/ocis -f 'charts/ocis/ci/values.yaml' > charts/ocis/ci/templated.yaml

.PHONY: api-1.31.0-kubeconform
api-1.31.0-kubeconform: $(KUBECONFORM)
$(KUBECONFORM) -kubernetes-version 1.31.0 -summary -strict charts/ocis/ci/templated.yaml

.PHONY: tools-update
tools-update: $(BINGO)
Expand Down

0 comments on commit cbd38cf

Please sign in to comment.