Skip to content

Commit

Permalink
bump to osdk 1.15 (#79)
Browse files Browse the repository at this point in the history
* bump to osdk 1.15

Signed-off-by: raffaelespazzoli <raffaele.spazzoli@gmail.com>

* restored value

Signed-off-by: raffaelespazzoli <raffaele.spazzoli@gmail.com>
raffaelespazzoli authored Nov 26, 2021
1 parent 410a587 commit db103cf
Showing 5 changed files with 167 additions and 187 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -37,8 +37,8 @@ BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION)

# Image URL to use all building/pushing image targets
IMG ?= controller:latest
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.22

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
@@ -77,7 +77,7 @@ help: ## Display this help.
##@ Development

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

generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
1 change: 0 additions & 1 deletion config/rbac/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
resources:
- service_account.yaml
- role.yaml
- role_binding.yaml
- leader_election_role.yaml
5 changes: 0 additions & 5 deletions config/rbac/service_account.yaml

This file was deleted.

20 changes: 10 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
@@ -3,21 +3,21 @@ module github.com/redhat-cop/operator-utils
go 1.16

require (
github.com/BurntSushi/toml v0.3.1
github.com/BurntSushi/toml v0.4.1
github.com/Masterminds/sprig/v3 v3.2.2
github.com/evanphx/json-patch v4.11.0+incompatible
github.com/evanphx/json-patch v5.6.0+incompatible
github.com/fatih/set v0.2.1
github.com/go-logr/logr v0.4.0
github.com/hashicorp/go-multierror v1.1.1
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.13.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.17.0
github.com/pkg/errors v0.9.1
github.com/scylladb/go-set v1.0.2
k8s.io/api v0.21.2
k8s.io/apimachinery v0.21.2
k8s.io/client-go v0.21.2
k8s.io/kubectl v0.21.2
sigs.k8s.io/controller-runtime v0.9.2
sigs.k8s.io/yaml v1.2.0
k8s.io/api v0.22.1
k8s.io/apimachinery v0.22.1
k8s.io/client-go v0.22.1
k8s.io/kubectl v0.22.1
sigs.k8s.io/controller-runtime v0.10.0
sigs.k8s.io/yaml v1.3.0

)
322 changes: 154 additions & 168 deletions go.sum

Large diffs are not rendered by default.

0 comments on commit db103cf

Please sign in to comment.