-
Notifications
You must be signed in to change notification settings - Fork 27
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.
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
openshift:main
from
dtfranz:upstream-rebase
Jul 6, 2023
Merged
Upstream rebase #23
Changes from 20 commits
Commits
Show all changes
65 commits
Select commit
Hold shift + click to select a range
f764f50
Consolidate bundle and BD controller code
joelanford a9f3909
add resources to watch list
akihikokuroda df9aae6
local git repository for e2e test
akihikokuroda 5075f0c
relocate test tools
akihikokuroda 22d1c46
set bundle deployment controller name correctly
joelanford 42e7382
style: introduce gosec linter
Kavinjsir bcae4aa
Fix e2e: Force localhost for some containers
tmshort 04ffa9b
Bump helm to v3.11.1 to address CVE-2023-25165
tmshort 5f2c6d5
squash! Bump helm to v3.11.1 to address CVE-2023-25165
tmshort 4d878be
Move to the new Kubernetes image repository
awgreene 3d528fe
Remote debug make target
dtfranz 39b6786
use multi-arch alpine image for git test server
joelanford d7e4fbc
improve/rename local source to support multiple configmaps
joelanford 9293130
moved more configmaps source validation to webhooks, fixed bug in dup…
joelanford 83e7c17
Rukpak Actions Updates
dtfranz 91d7612
bump to controller-gen v0.11.4 to remove creation timestamp from gene…
joelanford b87a2a6
version: use go1.18+ embedded build info
joelanford e519417
use map to map modified boolean to dirty/clean, fix license header
joelanford abf668c
Fix a link to plain bundle spec.
doriath dbabbbc
UPSTREAM: <carry>: update vendor dir, resolve other differences betwe…
dtfranz 65fd605
bump goreleaser to 1.17.2 (and simplify CI in the process)
joelanford 8bf4a1d
Don't swallow the not-found error
ncdc 4bd4103
Fix a couple of broken links in CONTRIBUTING.md
fgiloux b194b04
Rename defaults_upstream.go to defaults.go
ncdc e04009c
Remove upstream build tag
ncdc 25a45e5
[fix] Fix tag of default unpack image
varshaprasad96 a2ac2d4
Move bundle underneath controllers
ncdc 553de6d
Rename bundleProvisioner to controller
ncdc 0489740
Move bundledeployment underneath controllers
ncdc 8c3d57d
Rename bundledeploymentProvisioner to controller
ncdc b19be0c
Switch tools to bingo
dtfranz 892465c
UPSTREAM: <carry>: Fix test mismatched with upstream
dtfranz 49e5b24
Improving linter reporting in github actions
a616826
Fixes make lint when run without args
6a163b9
Replaces super-linter with markdown linter
3952f32
Updates golangci-lint
453ea91
Fixes linting issues
5a86574
Adds importas rules
89fa703
Removes deprecated `--progress` flag from Ginkgo
2a69b86
Adds ginkgolinter
9ffde03
Bingo Kustomize
dtfranz 888103e
Fix most deprecation warnings from kustomize
dtfranz f20ef1d
Fix some placement for kustomization so value replacements work properly
dtfranz 5efac04
UPSTREAM: <carry>: Adding manifests
dtfranz 5d0771e
bump to go 1.20
joelanford 5255c70
Shuffle manifests around to apply different cert management overlays.
dtfranz 9d657f7
Moved core and webhook cert-manager files to overlay
dtfranz 98ab75c
Finish moving cert-manager resources to overlay folder.
dtfranz 8fc03d1
Split webhooks kustomizeconfig to keep cert-manager resources separate
dtfranz d8f860d
Patch webhooks cert name with supplied cert
dtfranz 8ef39df
More re-org, remove some namePrefixing, move ca-injection for validat…
dtfranz b092f3b
Fix e2e
dtfranz 0b84074
Fix debug target, simplify base resources import.
dtfranz c68486b
Move cert args for cert-manager to patch
dtfranz 5bd5f98
Moved cert-manager specific cert args and secret names for webhook an…
dtfranz c4ef29c
Re-org manifests structure, add README, preserve bundle-cache and upl…
dtfranz b4b926f
Adding manifests verification step for PRs
dtfranz b2c40ff
UPSTREAM: <carry>: Generate openshift manifests using kustomize overlay
dtfranz 743df43
Adds codecov integration
1038c3e
bump controller-gen to v0.12.0
joelanford 45fdfda
Bingo version updates
dtfranz ccdff71
UPSTREAM: <carry>: Bump go version to 1.20 in openshift/, update mani…
dtfranz 8e3fca6
Update openshift/Dockerfile
dtfranz a16de78
UPSTREAM: <carry>: use go1.20 to build
ncdc 4b1a5d6
UPSTREAM: 650: detect in-cluster namespace by default, --system-names…
joelanford File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| name: e2e | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| pull_request: | ||
| push: | ||
| branches: | ||
| - main | ||
|
|
||
| jobs: | ||
| e2e-kind: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-go@v4 | ||
| with: | ||
| go-version-file: "go.mod" | ||
| - name: Run e2e tests | ||
| run: | | ||
| make e2e |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| name: go-apidiff | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| pull_request: | ||
| push: | ||
| branches: | ||
| - main | ||
|
|
||
| jobs: | ||
| go-apidiff: | ||
| if: github.event_name == 'pull_request' | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Check out code into the Go module directory | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| fetch-depth: 0 | ||
| - name: Set up Go | ||
| uses: actions/setup-go@v4 | ||
| with: | ||
| go-version-file: "go.mod" | ||
| id: go | ||
| - name: Run go-apidiff | ||
| uses: joelanford/go-apidiff@main |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| --- | ||
| name: release-e2e | ||
|
|
||
| on: | ||
| release: | ||
| types: | ||
| - published | ||
| - edited | ||
|
|
||
| jobs: | ||
| release-e2e-kind: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-go@v4 | ||
| with: | ||
| go-version-file: "go.mod" | ||
|
|
||
| - name: Download kubectl | ||
| run: | | ||
| curl -LO "https://dl.k8s.io/release/$(go list -m k8s.io/kubectl | cut -d" " -f2 | sed 's/^v0/v1/')/bin/linux/amd64/kubectl" | ||
| sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl | ||
|
|
||
| - name: Start a kind cluster | ||
| run: make kind-cluster | ||
|
|
||
| - name: Install the cert-manager dependency | ||
| run: make cert-mgr | ||
|
|
||
| - name: Install the rukpak release manifests | ||
| run: | | ||
| kubectl apply -f https://github.com/operator-framework/rukpak/releases/download/${{ github.event.release.tag_name }}/rukpak.yaml | ||
| make wait | ||
|
|
||
| - name: Load testdata bundle container images into kind | ||
| run: make kind-load-bundles KIND=hack/tools/bin/kind | ||
|
|
||
| - name: Run e2e tests | ||
| run: make test-e2e KIND=hack/tools/bin/kind |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| name: release | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| push: | ||
| branches: | ||
| - 'main' | ||
| tags: | ||
| - 'v*' | ||
| pull_request: | ||
| branches: | ||
| - main | ||
|
|
||
| jobs: | ||
| goreleaser: | ||
| name: goreleaser | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Check out code into the Go module directory | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Install Go | ||
| uses: actions/setup-go@v4 | ||
| with: | ||
| go-version-file: "go.mod" | ||
|
|
||
| - name: Docker Login | ||
| if: ${{ github.event_name != 'pull_request' }} | ||
| uses: docker/login-action@v2 | ||
| with: | ||
| registry: quay.io | ||
| username: ${{ secrets.QUAY_USERNAME }} | ||
| password: ${{ secrets.QUAY_PASSWORD }} | ||
|
|
||
| - name: Set the release related variables | ||
| run: | | ||
| if [[ $GITHUB_REF == refs/tags/* ]]; then | ||
| # Release tags. | ||
| echo IMAGE_TAG="${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV | ||
| echo GORELEASER_ARGS="--rm-dist" >> $GITHUB_ENV | ||
| echo DISABLE_RELEASE_PIPELINE=false >> $GITHUB_ENV | ||
| elif [[ $GITHUB_REF == refs/heads/* ]]; then | ||
| # Branch build. | ||
| echo IMAGE_TAG="$(echo "${GITHUB_REF#refs/heads/}" | sed -r 's|/+|-|g')" >> $GITHUB_ENV | ||
| echo GORELEASER_ARGS="--rm-dist --skip-validate" >> $GITHUB_ENV | ||
| elif [[ $GITHUB_REF == refs/pull/* ]]; then | ||
| # PR build. | ||
| echo IMAGE_TAG="pr-$(echo "${GITHUB_REF}" | sed -E 's|refs/pull/([^/]+)/?.*|\1|')" >> $GITHUB_ENV | ||
| else | ||
| echo IMAGE_TAG="$(git describe --tags --always)" >> $GITHUB_ENV | ||
| fi | ||
|
|
||
| - name: Generate the rukpak release manifests | ||
| if: ${{ startsWith(github.ref, 'refs/tags/v') }} | ||
| run: | | ||
| echo VERSION="${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV | ||
| make quickstart | ||
|
|
||
| - name: Run goreleaser | ||
| run: make release | ||
| env: | ||
| GITHUB_TOKEN: ${{ github.token }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| name: sanity | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| pull_request: | ||
| push: | ||
| branches: | ||
| - main | ||
|
|
||
| jobs: | ||
| verify: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-go@v4 | ||
| with: | ||
| go-version-file: "go.mod" | ||
| - name: Run verification checks | ||
| run: make verify | ||
| lint: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - uses: actions/setup-go@v4 | ||
| with: | ||
| go-version-file: "go.mod" | ||
|
|
||
| - name: Run golangci linting checks | ||
| run: make lint | ||
| markdown: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Lint markdown files | ||
| uses: github/super-linter/slim@v4 | ||
| env: | ||
| VALIDATE_ALL_CODEBASE: true | ||
| DEFAULT_BRANCH: main | ||
| # only runs the markdown linter | ||
| VALIDATE_MARKDOWN: true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| name: stale | ||
| on: | ||
| workflow_dispatch: | ||
| schedule: | ||
| # The start of everyday and at hour 12 | ||
| - cron: '00 00 * * *' | ||
|
|
||
| jobs: | ||
| stale: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/stale@v8.0.0 | ||
| id: stale | ||
| with: | ||
| # Overall configuration | ||
| operations-per-run: 100 | ||
|
|
||
| # PR configuration | ||
| days-before-pr-stale: 30 | ||
| stale-pr-message: 'This PR has become stale because it has been open for 30 days with no activity. Please update this PR or remove the `lifecycle/stale` label before it is automatically closed in 30 days. Adding the `lifecycle/frozen` label will cause this PR to ignore lifecycle events.' | ||
| days-before-pr-close: 30 | ||
| close-pr-message: 'This PR has been closed as no updates were detected after 30 days of being stale. Please feel free to reopen this PR if necessary.' | ||
| stale-pr-label: lifecycle/stale | ||
| exempt-pr-labels: lifecycle/frozen | ||
| close-pr-label: lifecycle/rotten | ||
|
|
||
| # Issue configuration | ||
| days-before-issue-stale: 60 | ||
| stale-issue-message: 'This issue has become stale because it has been open 60 days with no activity. The maintainers of this repo will remove this label during issue triage or it will be removed automatically after an update. Adding the `lifecycle/frozen` label will cause this issue to ignore lifecycle events.' | ||
| days-before-issue-close: -1 | ||
| stale-issue-label: lifecycle/stale | ||
| exempt-issue-labels: lifecycle/frozen |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| name: todo | ||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| jobs: | ||
| build: | ||
| runs-on: "ubuntu-latest" | ||
| steps: | ||
| - uses: "actions/checkout@v3" | ||
| - name: "Create issues from TODO comments" | ||
| uses: "alstr/todo-to-issue-action@v4.6.2" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| name: unit | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| pull_request: | ||
| push: | ||
| branches: | ||
| - main | ||
|
|
||
| jobs: | ||
| unit: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-go@v4 | ||
| with: | ||
| go-version-file: "go.mod" | ||
| - run: make test-unit |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you undo this so it's unmodified from upstream? You can
git add -fto add vendor files.