Skip to content

Commit add7486

Browse files
RunnerMRunnerM
authored
Merge pull request #98 from RunnerM/develop
Bump dependencies +webhook-semver:patch
2 parents 06f3ad6 + 48d8b82 commit add7486

File tree

8 files changed

+121
-89
lines changed

8 files changed

+121
-89
lines changed

‎.devcontainer/devcontainer.json

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/go
3+
{
4+
"name": "Go",
5+
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6+
"image": "mcr.microsoft.com/devcontainers/go:1-1.21-bookworm"
7+
8+
// Features to add to the dev container. More info: https://containers.dev/features.
9+
// "features": {},
10+
11+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
12+
// "forwardPorts": [],
13+
14+
// Use 'postCreateCommand' to run commands after the container is created.
15+
// "postCreateCommand": "go version",
16+
17+
// Configure tool-specific properties.
18+
// "customizations": {},
19+
20+
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
21+
// "remoteUser": "root"
22+
}

‎.github/ISSUE_TEMPLATE/bug_report.md

+7
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ assignees: RunnerM
77

88
---
99

10+
**If you have done the folowing debug steps and your issue still exist please fill out the bug report.**
11+
12+
- You have made a test round validating your credentials just using the config option.
13+
- You have validated credentials and encoded them properly with `echo -n SECRET_KEY | base64` command.
14+
- You enabled debug logging are not getting a 401 in the pod logs.
15+
16+
1017
**Describe the bug**
1118
A clear and concise description of what the bug is.
1219

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.20-alpine3.16 AS build_deps
1+
FROM golang:1.22-alpine3.18 AS build_deps
22

33
RUN apk add --no-cache git
44

@@ -15,7 +15,7 @@ COPY . .
1515

1616
RUN CGO_ENABLED=0 go build -o webhook -ldflags '-w -extldflags "-static"' .
1717

18-
FROM alpine:3.16
18+
FROM alpine:3.18
1919

2020
RUN apk add --no-cache ca-certificates
2121

‎GitVersion.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
mode: ContinuousDelivery
22
tag-prefix: '[vV]'
33
continuous-delivery-fallback-tag: ci
4-
major-version-bump-message: '\s?(breaking|major)'
5-
minor-version-bump-message: '\s?(feature|minor)'
6-
patch-version-bump-message: '\s?(fix|patch)'
4+
major-version-bump-message: '\+webhook-semver:\s?(breaking|major)'
5+
minor-version-bump-message: '\+webhook-semver:\s?(feature|minor)'
6+
patch-version-bump-message: '\+webhook-semver:\s?(fix|patch)'
77
no-bump-message: '\s?(none|skip)'
88
commit-message-incrementing: Enabled
99
branches:

‎Makefile

+22-20
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,39 @@ IMAGE_TAG := "latest"
77

88
OUT := $(shell pwd)/_out
99

10-
KUBE_VERSION=1.28.0
10+
KUBEBUILDER_VERSION=1.28.0
1111

12+
HELM_FILES := $(shell find deploy/simply-dns-webhook)
1213

13-
$(shell mkdir -p "$(OUT)")
14-
export TEST_ASSET_ETCD=_test/kubebuilder/etcd
15-
export TEST_ASSET_KUBE_APISERVER=_test/kubebuilder/kube-apiserver
16-
export TEST_ASSET_KUBECTL=_test/kubebuilder/kubectl
14+
test: _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/etcd _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kube-apiserver _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kubectl
15+
TEST_ASSET_ETCD=_test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/etcd \
16+
TEST_ASSET_KUBE_APISERVER=_test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kube-apiserver \
17+
TEST_ASSET_KUBECTL=_test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kubectl \
18+
$(GO) test -v .
1719

18-
test: _test/kubebuilder
19-
$(GO) test -v -race -coverprofile=coverage.txt -covermode=atomic .
20+
_test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH).tar.gz: | _test
21+
curl -fsSL https://go.kubebuilder.io/test-tools/$(KUBEBUILDER_VERSION)/$(OS)/$(ARCH) -o $@
2022

21-
_test/kubebuilder:
22-
curl -fsSL https://go.kubebuilder.io/test-tools/$(KUBE_VERSION)/$(OS)/$(ARCH) -o kubebuilder-tools.tar.gz
23-
mkdir -p _test/kubebuilder
24-
tar -xvf kubebuilder-tools.tar.gz
25-
mv kubebuilder/bin/* _test/kubebuilder/
26-
rm kubebuilder-tools.tar.gz
27-
rm -R kubebuilder
23+
_test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/etcd _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kube-apiserver _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kubectl: _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH).tar.gz | _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)
24+
tar xfO $< kubebuilder/bin/$(notdir $@) > $@ && chmod +x $@
2825

29-
clean: clean-kubebuilder
30-
31-
clean-kubebuilder:
32-
rm -Rf _test/kubebuilder
26+
.PHONY: clean
27+
clean:
28+
rm -r _test $(OUT)
3329

30+
.PHONY: build
3431
build:
3532
docker build -t "$(IMAGE_NAME):$(IMAGE_TAG)" .
3633

3734
.PHONY: rendered-manifest.yaml
38-
rendered-manifest.yaml:
35+
rendered-manifest.yaml: $(OUT)/rendered-manifest.yaml
36+
37+
$(OUT)/rendered-manifest.yaml: $(HELM_FILES) | $(OUT)
3938
helm template \
4039
--name example-webhook \
4140
--set image.repository=$(IMAGE_NAME) \
4241
--set image.tag=$(IMAGE_TAG) \
43-
deploy/example-webhook > "$(OUT)/rendered-manifest.yaml"
42+
deploy/example-webhook > $@
43+
44+
_test $(OUT) _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH):
45+
mkdir -p $@

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<div align="center">
1212

13-
[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/simply-dns-webhook)](https://artifacthub.io/packages/search?repo=simply-dns-webhook) ![GitHub](https://img.shields.io/github/license/runnerm/simply-dns-webhook) ![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/runnerm/simply-dns-webhook) [![Go Report Card](https://goreportcard.com/badge/github.com/runnerm/simply-dns-webhook)](https://goreportcard.com/report/github.com/runnerm/simply-dns-webhook) [![codecov](https://codecov.io/gh/RunnerM/simply-dns-webhook/graph/badge.svg?token=O7YKKBP0IO)](https://codecov.io/gh/RunnerM/simply-dns-webhook) ![GitHub Repo stars](https://img.shields.io/github/stars/runnerm/simply-dns-webhook) ![Image pulls](https://img.shields.io/badge/Image%20pulls-70K<-brightgreen)
13+
[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/simply-dns-webhook)](https://artifacthub.io/packages/search?repo=simply-dns-webhook) ![GitHub](https://img.shields.io/github/license/runnerm/simply-dns-webhook) ![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/runnerm/simply-dns-webhook) [![Go Report Card](https://goreportcard.com/badge/github.com/runnerm/simply-dns-webhook)](https://goreportcard.com/report/github.com/runnerm/simply-dns-webhook) [![codecov](https://codecov.io/gh/RunnerM/simply-dns-webhook/graph/badge.svg?token=O7YKKBP0IO)](https://codecov.io/gh/RunnerM/simply-dns-webhook) ![GitHub Repo stars](https://img.shields.io/github/stars/runnerm/simply-dns-webhook) ![Image pulls](https://img.shields.io/badge/Image%20pulls-85K<-brightgreen)
1414

1515
</div>
1616

‎go.mod

+22-20
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
module github.com/runnerm/simply-dns-webhook
22

3-
go 1.21
3+
go 1.22.0
4+
5+
toolchain go1.22.2
46

57
require (
6-
github.com/cert-manager/cert-manager v1.14.4
8+
github.com/cert-manager/cert-manager v1.14.5
79
github.com/runnerm/simply-com-client v1.0.0
810
github.com/sirupsen/logrus v1.9.3
9-
k8s.io/apiextensions-apiserver v0.29.2
10-
k8s.io/apimachinery v0.29.2
11-
k8s.io/client-go v0.29.2
11+
k8s.io/apiextensions-apiserver v0.30.0
12+
k8s.io/apimachinery v0.30.0
13+
k8s.io/client-go v0.30.0
1214
)
1315

1416
require (
@@ -36,8 +38,8 @@ require (
3638
github.com/go-openapi/swag v0.22.7 // indirect
3739
github.com/gogo/protobuf v1.3.2 // indirect
3840
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
39-
github.com/golang/protobuf v1.5.3 // indirect
40-
github.com/google/cel-go v0.17.7 // indirect
41+
github.com/golang/protobuf v1.5.4 // indirect
42+
github.com/google/cel-go v0.17.8 // indirect
4143
github.com/google/gnostic-models v0.6.8 // indirect
4244
github.com/google/go-cmp v0.6.0 // indirect
4345
github.com/google/gofuzz v1.2.0 // indirect
@@ -76,17 +78,17 @@ require (
7678
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
7779
go.uber.org/multierr v1.11.0 // indirect
7880
go.uber.org/zap v1.26.0 // indirect
79-
golang.org/x/crypto v0.17.0 // indirect
81+
golang.org/x/crypto v0.22.0 // indirect
8082
golang.org/x/exp v0.0.0-20231226003508-02704c960a9b // indirect
81-
golang.org/x/mod v0.14.0 // indirect
82-
golang.org/x/net v0.19.0 // indirect
83+
golang.org/x/mod v0.15.0 // indirect
84+
golang.org/x/net v0.24.0 // indirect
8385
golang.org/x/oauth2 v0.15.0 // indirect
84-
golang.org/x/sync v0.5.0 // indirect
85-
golang.org/x/sys v0.15.0 // indirect
86-
golang.org/x/term v0.15.0 // indirect
86+
golang.org/x/sync v0.6.0 // indirect
87+
golang.org/x/sys v0.19.0 // indirect
88+
golang.org/x/term v0.19.0 // indirect
8789
golang.org/x/text v0.14.0 // indirect
8890
golang.org/x/time v0.5.0 // indirect
89-
golang.org/x/tools v0.16.1 // indirect
91+
golang.org/x/tools v0.18.0 // indirect
9092
google.golang.org/appengine v1.6.8 // indirect
9193
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
9294
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
@@ -97,12 +99,12 @@ require (
9799
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
98100
gopkg.in/yaml.v2 v2.4.0 // indirect
99101
gopkg.in/yaml.v3 v3.0.1 // indirect
100-
k8s.io/api v0.29.2 // indirect
101-
k8s.io/apiserver v0.29.2 // indirect
102-
k8s.io/component-base v0.29.2 // indirect
103-
k8s.io/klog/v2 v2.110.1 // indirect
104-
k8s.io/kms v0.29.2 // indirect
105-
k8s.io/kube-openapi v0.0.0-20240103051144-eec4567ac022 // indirect
102+
k8s.io/api v0.30.0 // indirect
103+
k8s.io/apiserver v0.30.0 // indirect
104+
k8s.io/component-base v0.30.0 // indirect
105+
k8s.io/klog/v2 v2.120.1 // indirect
106+
k8s.io/kms v0.30.0 // indirect
107+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
106108
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
107109
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
108110
sigs.k8s.io/controller-runtime v0.16.3 // indirect

0 commit comments

Comments
 (0)