Skip to content

Commit 0c9ed2f

Browse files
authored
Merge pull request #396 from stakater/release-fix
Fix go releaser
2 parents 68663ba + 86ce108 commit 0c9ed2f

File tree

6 files changed

+8
-11
lines changed

6 files changed

+8
-11
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
id: go
2727

2828
- name: Run GoReleaser
29-
uses: goreleaser/goreleaser-action@v3
29+
uses: goreleaser/goreleaser-action@master
3030
with:
3131
version: latest
3232
args: release --rm-dist

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ out
77
/_output/
88
.local
99
bin
10-
cover.out
10+
cover.out
11+
testbin

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.16 as builder
2+
FROM golang:1.18 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION)
3838

3939
# Image URL to use all building/pushing image targets
4040
IMG ?= controller:latest
41-
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
42-
CRD_OPTIONS ?= "crd:trivialVersions=true,crdVersions=v1,preserveUnknownFields=false"
4341

4442
# GOLANGCI_LINT env
4543
GOLANGCI_LINT = _output/tools/golangci-lint
@@ -74,7 +72,7 @@ help: ## Display this help.
7472
##@ Development
7573

7674
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
77-
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
75+
$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
7876

7977
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
8078
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
@@ -120,7 +118,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
120118

121119
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
122120
controller-gen: ## Download controller-gen locally if necessary.
123-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1)
121+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0)
124122

125123
KUSTOMIZE = $(shell pwd)/bin/kustomize
126124
kustomize: ## Download kustomize locally if necessary.

charts/ingressmonitorcontroller/crds/endpointmonitor.stakater.com_endpointmonitors.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.1
6+
controller-gen.kubebuilder.io/version: v0.8.0
87
creationTimestamp: null
98
name: endpointmonitors.endpointmonitor.stakater.com
109
spec:

config/crd/bases/endpointmonitor.stakater.com_endpointmonitors.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.1
6+
controller-gen.kubebuilder.io/version: v0.8.0
87
creationTimestamp: null
98
name: endpointmonitors.endpointmonitor.stakater.com
109
spec:

0 commit comments

Comments
 (0)