Skip to content

Upstream rebase #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 65 commits into from
Jul 6, 2023
Merged

Upstream rebase #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
f764f50
Consolidate bundle and BD controller code
joelanford Sep 22, 2022
a9f3909
add resources to watch list
akihikokuroda Aug 22, 2022
df9aae6
local git repository for e2e test
akihikokuroda Oct 6, 2022
5075f0c
relocate test tools
akihikokuroda Oct 12, 2022
22d1c46
set bundle deployment controller name correctly
joelanford Nov 4, 2022
42e7382
style: introduce gosec linter
Kavinjsir Nov 19, 2022
bcae4aa
Fix e2e: Force localhost for some containers
tmshort Feb 21, 2023
04ffa9b
Bump helm to v3.11.1 to address CVE-2023-25165
tmshort Feb 20, 2023
5f2c6d5
squash! Bump helm to v3.11.1 to address CVE-2023-25165
tmshort Feb 22, 2023
4d878be
Move to the new Kubernetes image repository
awgreene Feb 22, 2023
3d528fe
Remote debug make target
dtfranz Feb 28, 2023
39b6786
use multi-arch alpine image for git test server
joelanford Apr 7, 2023
d7e4fbc
improve/rename local source to support multiple configmaps
joelanford Mar 29, 2023
9293130
moved more configmaps source validation to webhooks, fixed bug in dup…
joelanford Apr 7, 2023
83e7c17
Rukpak Actions Updates
dtfranz Apr 19, 2023
91d7612
bump to controller-gen v0.11.4 to remove creation timestamp from gene…
joelanford Apr 21, 2023
b87a2a6
version: use go1.18+ embedded build info
joelanford Apr 20, 2023
e519417
use map to map modified boolean to dirty/clean, fix license header
joelanford Apr 21, 2023
abf668c
Fix a link to plain bundle spec.
doriath Apr 22, 2023
dbabbbc
UPSTREAM: <carry>: update vendor dir, resolve other differences betwe…
dtfranz Jun 6, 2023
65fd605
bump goreleaser to 1.17.2 (and simplify CI in the process)
joelanford Apr 27, 2023
8bf4a1d
Don't swallow the not-found error
ncdc May 16, 2023
4bd4103
Fix a couple of broken links in CONTRIBUTING.md
fgiloux May 17, 2023
b194b04
Rename defaults_upstream.go to defaults.go
ncdc May 23, 2023
e04009c
Remove upstream build tag
ncdc May 23, 2023
25a45e5
[fix] Fix tag of default unpack image
varshaprasad96 May 25, 2023
a2ac2d4
Move bundle underneath controllers
ncdc May 31, 2023
553de6d
Rename bundleProvisioner to controller
ncdc May 31, 2023
0489740
Move bundledeployment underneath controllers
ncdc Jun 1, 2023
8c3d57d
Rename bundledeploymentProvisioner to controller
ncdc Jun 1, 2023
b19be0c
Switch tools to bingo
dtfranz Jun 7, 2023
892465c
UPSTREAM: <carry>: Fix test mismatched with upstream
dtfranz Jun 8, 2023
49e5b24
Improving linter reporting in github actions
Jun 13, 2023
a616826
Fixes make lint when run without args
Jun 14, 2023
6a163b9
Replaces super-linter with markdown linter
Jun 13, 2023
3952f32
Updates golangci-lint
Jun 14, 2023
453ea91
Fixes linting issues
Jun 14, 2023
5a86574
Adds importas rules
Jun 15, 2023
89fa703
Removes deprecated `--progress` flag from Ginkgo
Jun 15, 2023
2a69b86
Adds ginkgolinter
Jun 14, 2023
9ffde03
Bingo Kustomize
dtfranz Jun 12, 2023
888103e
Fix most deprecation warnings from kustomize
dtfranz Jun 13, 2023
f20ef1d
Fix some placement for kustomization so value replacements work properly
dtfranz Jun 14, 2023
5efac04
UPSTREAM: <carry>: Adding manifests
dtfranz Jun 16, 2023
5d0771e
bump to go 1.20
joelanford Jun 21, 2023
5255c70
Shuffle manifests around to apply different cert management overlays.
dtfranz Jun 22, 2023
9d657f7
Moved core and webhook cert-manager files to overlay
dtfranz Jun 22, 2023
98ab75c
Finish moving cert-manager resources to overlay folder.
dtfranz Jun 22, 2023
8fc03d1
Split webhooks kustomizeconfig to keep cert-manager resources separate
dtfranz Jun 22, 2023
d8f860d
Patch webhooks cert name with supplied cert
dtfranz Jun 22, 2023
8ef39df
More re-org, remove some namePrefixing, move ca-injection for validat…
dtfranz Jun 22, 2023
b092f3b
Fix e2e
dtfranz Jun 22, 2023
0b84074
Fix debug target, simplify base resources import.
dtfranz Jun 23, 2023
c68486b
Move cert args for cert-manager to patch
dtfranz Jun 23, 2023
5bd5f98
Moved cert-manager specific cert args and secret names for webhook an…
dtfranz Jun 23, 2023
c4ef29c
Re-org manifests structure, add README, preserve bundle-cache and upl…
dtfranz Jun 27, 2023
b4b926f
Adding manifests verification step for PRs
dtfranz Jun 15, 2023
b2c40ff
UPSTREAM: <carry>: Generate openshift manifests using kustomize overlay
dtfranz Jun 27, 2023
743df43
Adds codecov integration
Jun 27, 2023
1038c3e
bump controller-gen to v0.12.0
joelanford Jun 27, 2023
45fdfda
Bingo version updates
dtfranz Jun 28, 2023
ccdff71
UPSTREAM: <carry>: Bump go version to 1.20 in openshift/, update mani…
dtfranz Jun 29, 2023
8e3fca6
Update openshift/Dockerfile
dtfranz Jun 29, 2023
a16de78
UPSTREAM: <carry>: use go1.20 to build
ncdc Jul 3, 2023
4b1a5d6
UPSTREAM: 650: detect in-cluster namespace by default, --system-names…
joelanford Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 13 additions & 0 deletions .bingo/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

# Ignore everything
*

# But not these files:
!.gitignore
!*.mod
!*.sum
!README.md
!Variables.mk
!variables.env

*tmp.mod
14 changes: 14 additions & 0 deletions .bingo/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Project Development Dependencies.

This is directory which stores Go modules with pinned buildable package that is used within this repository, managed by https://github.com/bwplotka/bingo.

* Run `bingo get` to install all tools having each own module file in this directory.
* Run `bingo get <tool>` to install <tool> that have own module file in this directory.
* For Makefile: Make sure to put `include .bingo/Variables.mk` in your Makefile, then use $(<upper case tool name>) variable where <tool> is the .bingo/<tool>.mod.
* For shell: Run `source .bingo/variables.env` to source all environment variable for each tool.
* For go: Import `.bingo/variables.go` to for variable names.
* See https://github.com/bwplotka/bingo or -h on how to add, remove or change binaries dependencies.

## Requirements

* Go 1.14+
73 changes: 73 additions & 0 deletions .bingo/Variables.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.8. DO NOT EDIT.
# All tools are designed to be build inside $GOBIN.
BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
GOPATH ?= $(shell go env GOPATH)
GOBIN ?= $(firstword $(subst :, ,${GOPATH}))/bin
GO ?= $(shell which go)

# Below generated variables ensure that every time a tool under each variable is invoked, the correct version
# will be used; reinstalling only if needed.
# For example for bingo variable:
#
# In your main Makefile (for non array binaries):
#
#include .bingo/Variables.mk # Assuming -dir was set to .bingo .
#
#command: $(BINGO)
# @echo "Running bingo"
# @$(BINGO) <flags/args..>
#
BINGO := $(GOBIN)/bingo-v0.8.0
$(BINGO): $(BINGO_DIR)/bingo.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)/bingo-v0.8.0"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.8.0 "github.com/bwplotka/bingo"

CONTROLLER_GEN := $(GOBIN)/controller-gen-v0.12.0
$(CONTROLLER_GEN): $(BINGO_DIR)/controller-gen.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)/controller-gen-v0.12.0"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=controller-gen.mod -o=$(GOBIN)/controller-gen-v0.12.0 "sigs.k8s.io/controller-tools/cmd/controller-gen"

GINKGO := $(GOBIN)/ginkgo-v2.8.3
$(GINKGO): $(BINGO_DIR)/ginkgo.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)/ginkgo-v2.8.3"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=ginkgo.mod -o=$(GOBIN)/ginkgo-v2.8.3 "github.com/onsi/ginkgo/v2/ginkgo"

GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.53.2
$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.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)/golangci-lint-v1.53.2"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.53.2 "github.com/golangci/golangci-lint/cmd/golangci-lint"

GORELEASER := $(GOBIN)/goreleaser-v1.17.2
$(GORELEASER): $(BINGO_DIR)/goreleaser.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)/goreleaser-v1.17.2"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=goreleaser.mod -o=$(GOBIN)/goreleaser-v1.17.2 "github.com/goreleaser/goreleaser"

KIND := $(GOBIN)/kind-v0.17.0
$(KIND): $(BINGO_DIR)/kind.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)/kind-v0.17.0"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kind.mod -o=$(GOBIN)/kind-v0.17.0 "sigs.k8s.io/kind"

KUSTOMIZE := $(GOBIN)/kustomize-v5.0.1
$(KUSTOMIZE): $(BINGO_DIR)/kustomize.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)/kustomize-v5.0.1"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kustomize.mod -o=$(GOBIN)/kustomize-v5.0.1 "sigs.k8s.io/kustomize/kustomize/v5"

SETUP_ENVTEST := $(GOBIN)/setup-envtest-v0.0.0-20220607150856-0c2effbc7eab
$(SETUP_ENVTEST): $(BINGO_DIR)/setup-envtest.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)/setup-envtest-v0.0.0-20220607150856-0c2effbc7eab"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=setup-envtest.mod -o=$(GOBIN)/setup-envtest-v0.0.0-20220607150856-0c2effbc7eab "sigs.k8s.io/controller-runtime/tools/setup-envtest"

YQ := $(GOBIN)/yq-v4.34.1
$(YQ): $(BINGO_DIR)/yq.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)/yq-v4.34.1"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=yq.mod -o=$(GOBIN)/yq-v4.34.1 "github.com/mikefarah/yq/v4"

5 changes: 5 additions & 0 deletions .bingo/bingo.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

go 1.20

require github.com/bwplotka/bingo v0.8.0
40 changes: 40 additions & 0 deletions .bingo/bingo.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
github.com/bwplotka/bingo v0.8.0 h1:Cx9eQb+ed9aU7sbrmZagomKx+wYor9y5z5HM91bvp1U=
github.com/bwplotka/bingo v0.8.0/go.mod h1:eXPFwhZ92mmOUBk6F7aKcAJoq8HX88Ju3wLZKwtNKEw=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/creack/pty v1.1.15/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
github.com/efficientgo/core v1.0.0-rc.0 h1:jJoA0N+C4/knWYVZ6GrdHOtDyrg8Y/TR4vFpTaqTsqs=
github.com/efficientgo/core v1.0.0-rc.0/go.mod h1:kQa0V74HNYMfuJH6jiPiwNdpWXl4xd/K4tzlrcvYDQI=
github.com/frankban/quicktest v1.13.1/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og=
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/renameio v1.0.1/go.mod h1:t/HQoYBZSsWSNK35C6CO/TpPLDVWvxOHboWUAweKUpk=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA=
github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
github.com/rogpeppe/go-internal v1.8.1-0.20210923151022-86f73c517451/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210925032602-92d5a993a665/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f h1:rlezHXNlxYWvBCzNses9Dlc7nGFaNMJeqLolcmQSSZY=
golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20210916214954-140adaaadfaf/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
mvdan.cc/editorconfig v0.2.0/go.mod h1:lvnnD3BNdBYkhq+B4uBuFFKatfp02eB6HixDvEz91C0=
mvdan.cc/sh/v3 v3.4.3 h1:zbuKH7YH9cqU6PGajhFFXZY7dhPXcDr55iN/cUAqpuw=
mvdan.cc/sh/v3 v3.4.3/go.mod h1:p/tqPPI4Epfk2rICAe2RoaNd8HBSJ8t9Y2DA9yQlbzY=
5 changes: 5 additions & 0 deletions .bingo/controller-gen.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

go 1.20

require sigs.k8s.io/controller-tools v0.12.0 // cmd/controller-gen
Loading