Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
4e349e6
:seedling: Use Patch instead of Update for finalizer operations (#2328)
tmshort Dec 2, 2025
3aa6b80
Merge branch 'main' into synchronize
Dec 3, 2025
ff3a602
UPSTREAM: <carry>: Add OpenShift specific files
dtfranz Oct 26, 2023
1ae80a9
UPSTREAM: <carry>: Add new tests for single/own namespaces install modes
camilamacedo86 Oct 6, 2025
557c855
UPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
camilamacedo86 Oct 13, 2025
4f47e85
UPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp …
camilamacedo86 Oct 13, 2025
b6c47fe
UPSTREAM: <carry>: Update OCP catalogs to v4.21
tmshort Oct 13, 2025
77ec46b
UPSTREAM: <carry>: support singleown cases in disconnected
kuiwang02 Oct 16, 2025
2795af4
UPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
kuiwang02 Oct 17, 2025
e1e7467
UPSTREAM: <carry>: Define Default timeouts and apply their usage accr…
camilamacedo86 Oct 22, 2025
8a6a17f
UPSTREAM: <carry>: Update to new feature-gate options in helm
tmshort Oct 22, 2025
6c63a09
UPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniq…
camilamacedo86 Oct 22, 2025
3c5986d
UPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comme…
camilamacedo86 Oct 24, 2025
4abcc5a
UPSTREAM: <carry>: Update OwnSingle template to use spec.config.inlin…
kuiwang02 Nov 3, 2025
cf247ca
UPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension…
camilamacedo86 Nov 4, 2025
f1e6311
UPSTREAM: <carry>: Add [OTP] to migrated cases
kuiwang02 Nov 7, 2025
511e116
UPSTREAM: <carry>: [OTE]: Upgrade dependencies used
camilamacedo86 Nov 5, 2025
429524c
UPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version…
camilamacedo86 Nov 10, 2025
f1ac82a
UPSTREAM: <carry>: [Default Catalog Tests] Upgrade go 1.24.6 and depe…
camilamacedo86 Nov 11, 2025
c591a3f
UPSTREAM: <carry>: add disconnected environment support with custom p…
kuiwang02 Nov 12, 2025
3fdfa64
UPSTREAM: <carry>: migrate jiazha test cases to OTE
jianzhangbjz Nov 14, 2025
24361f7
UPSTREAM: <carry>: migrate clustercatalog case to ote
Xia-Zhao-rh Oct 17, 2025
058414c
UPSTREAM: <carry>: migrate olmv1 QE stress cases
kuiwang02 Nov 20, 2025
8c4b315
UPSTREAM: <carry>: Use busybox/httpd to simulate probes
tmshort Nov 25, 2025
07681af
UPSTREAM: <carry>: migrate olmv1 QE cases
Xia-Zhao-rh Nov 25, 2025
26a023c
UPSTREAM: <carry>: add agent for olmv1 qe cases
kuiwang02 Oct 21, 2025
e8795a4
UPSTREAM: <drop>: go mod vendor
Dec 3, 2025
3b6bcf9
UPSTREAM: <drop>: remove upstream GitHub configuration
Dec 3, 2025
ca1c967
UPSTREAM: <drop>: configure the commit-checker
Dec 3, 2025
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
  •  
  •  
  •  
Prev Previous commit
Next Next commit
Merge branch 'main' into synchronize
  • Loading branch information
ci-robot committed Dec 3, 2025
commit 3aa6b801eef593121b208aa54c43453e57bfed50
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 0 additions & 4 deletions .ci-operator.yaml

This file was deleted.

6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contact_links:
- name: Kubernetes slack
url: https://slack.k8s.io/
about: |
Join us on #olm-dev for discussions related to OLM Development or on
#kubernetes-operators for discussions related to the Operator pattern of Kubernetes API extension.
47 changes: 47 additions & 0 deletions .github/ISSUE_TEMPLATE/docs-issue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Docs issue for epics
description: Use this template for tracking doc impact for an epic.
title: "Docs: [EPIC NAME]"
labels: ["kind/documentation"]
body:
- type: textarea
id: user-story
attributes:
label: User story
description: Describe the user story or stories for this epic.
validations:
required: true
- type: textarea
id: issues-list
attributes:
label: List if issues
description: List the user-facing issues in the epic that require documentation.
placeholder: |
- Issue 1
validations:
required: true
- type: dropdown
id: new-or-update
attributes:
label: New content or update?
description: Does this epic require new content or updates to existing content?
options:
- Net-new content
- Update existing content
validations:
required: true
- type: dropdown
id: types-of-docs
attributes:
label: Types of documentation
description: What type of documentation is required for this epic?
options:
- Release note
- Concept
- Procedure
- Reference
multiple: true
- type: textarea
id: references
attributes:
label: References
description: Is there prior art or reference materials that would help write the documentation?
2 changes: 2 additions & 0 deletions .github/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
approvers:
- ci-approvers
31 changes: 31 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
cooldown:
default-days: 14
commit-message:
prefix: ":seedling:"
- package-ecosystem: "gomod"
directory: "/"
schedule:
interval: "daily"
cooldown:
default-days: 14
commit-message:
prefix: ":seedling:"
groups:
k8s-dependencies:
patterns:
- "k8s.io/*"
- "sigs.k8s.io/*"
- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "daily"
cooldown:
default-days: 14
commit-message:
prefix: ":seedling:"
25 changes: 25 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<!--
Please prefix the title of this PR with one of the following icons:

* ⚠ (:warning:, major/breaking change)
* ✨ (:sparkles:, minor/compatible change)
* 🐛 (:bug:, patch/bug fix)
* 📖 (:book:, docs)
* 🌱 (:seedling:, other)

-->

# Description

<!--
Thank you for your contribution!

Please provide a summary of the changes and the motivation behind the change.
-->

## Reviewer Checklist

- [ ] API Go Documentation
- [ ] Tests: Unit Tests (and E2E Tests, if appropriate)
- [ ] Comprehensive Commit Messages
- [ ] Links to related GitHub Issue(s)
19 changes: 19 additions & 0 deletions .github/workflows/add-to-project.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Add epic issues to OLMv1 project

on:
issues:
types:
- opened
- labeled

jobs:
add-to-project:
name: Add issue to project
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
with:
project-url: https://github.com/orgs/operator-framework/projects/8
github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
labeled: epic, v1.0, v1.x
label-operator: OR
20 changes: 20 additions & 0 deletions .github/workflows/crd-diff.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: crd-diff
on:
pull_request:
jobs:
crd-diff:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
with:
fetch-depth: 0

- uses: actions/setup-go@v6
with:
go-version-file: go.mod

- name: Run make verify-crd-compatibility
run: |
make verify-crd-compatibility \
CRD_DIFF_ORIGINAL_REF="git://${{ github.event.pull_request.base.sha }}?path=" \
CRD_DIFF_UPDATED_REF="git://${{ github.event.pull_request.head.sha }}?path="
75 changes: 75 additions & 0 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: e2e

on:
workflow_dispatch:
pull_request:
merge_group:
push:
branches:
- main

jobs:
e2e:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
test:
- name: extension-developer-e2e
make-target: test-extension-developer-e2e
use-artifacts: false
use-codecov: false
- name: e2e
make-target: test-e2e
use-artifacts: true
use-codecov: true
- name: experimental-e2e
make-target: test-experimental-e2e
use-artifacts: true
use-codecov: true
- name: upgrade-st2st-e2e
make-target: test-upgrade-st2st-e2e
use-artifacts: true
use-codecov: false
- name: upgrade-ex2ex-e2e
make-target: test-upgrade-ex2ex-e2e
use-artifacts: true
use-codecov: false
- name: upgrade-st2ex-e2e
make-target: test-upgrade-st2ex-e2e
use-artifacts: true
use-codecov: false
- name: st2ex-e2e
make-target: test-st2ex-e2e
use-artifacts: true
use-codecov: false
name: ${{ matrix.test.name }}
steps:
- uses: actions/checkout@v6

- uses: actions/setup-go@v6
with:
go-version-file: go.mod

- name: Run e2e test
run: |
if [[ "${{ matrix.test.use-artifacts }}" == "true" ]]; then
ARTIFACT_PATH=/tmp/artifacts E2E_SUMMARY_OUTPUT=$GITHUB_STEP_SUMMARY make ${{ matrix.test.make-target }}
else
make ${{ matrix.test.make-target }}
fi

- uses: actions/upload-artifact@v5
if: failure() && matrix.test.use-artifacts == true
with:
name: ${{ matrix.test.name }}-artifacts
path: /tmp/artifacts/

- uses: codecov/[email protected]
if: matrix.test.use-codecov == true
with:
disable_search: true
files: coverage/${{ matrix.test.name }}.out
flags: ${{ matrix.test.name }}
token: ${{ secrets.CODECOV_TOKEN }}

18 changes: 18 additions & 0 deletions .github/workflows/go-apidiff.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: go-apidiff
on:
merge_group:
pull_request:
jobs:
go-apidiff:
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v6
with:
fetch-depth: 0

- uses: actions/setup-go@v6
with:
go-version-file: go.mod

- uses: joelanford/go-apidiff@main
22 changes: 22 additions & 0 deletions .github/workflows/go-verdiff.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: go-verdiff
on:
pull_request:
branches:
- main
jobs:
go-verdiff:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Check golang version
run: |
export LABELS="$(gh api repos/$OWNER/$REPO/pulls/$PR --jq '.labels.[].name')"
hack/tools/check-go-version.sh -b "${{ github.event.pull_request.base.sha }}"
shell: bash
env:
GH_TOKEN: ${{ github.token }}
OWNER: ${{ github.repository_owner }}
REPO: ${{ github.event.repository.name }}
PR: ${{ github.event.pull_request.number }}
46 changes: 46 additions & 0 deletions .github/workflows/pages.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Build/Deploy Documentation
on:
# So we can trigger manually if needed
workflow_dispatch:

# To confirm any changes to docs build successfully, without deploying them
pull_request:
paths:
- "docs/**"
- ".github/workflows/pages.yaml"
- "mkdocs.yml"

# Pushes to branches do the full build + deployment
push:
branches:
- main
paths:
- "docs/**"
- ".github/workflows/pages.yaml"
- "mkdocs.yml"

permissions:
contents: write

# Don't allow multiple simultaneous instances because that would make deploying the docs nondeterministic
concurrency:
group: ${{ github.workflow }}

jobs:
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6

- uses: actions/setup-python@v6
with:
python-version: 3.x
cache: pip

# Deploy on merge
- run: make deploy-docs
if: github.event_name == 'push'

# Only build on everything else
- run: make build-docs
if: github.event_name != 'push'
13 changes: 13 additions & 0 deletions .github/workflows/pr-title.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
on:
pull_request_target:
types: [opened, edited, reopened, synchronize]

jobs:
pr-title:
runs-on: ubuntu-latest
name: Verify PR title
steps:
- name: Verify PR title
uses: kubernetes-sigs/[email protected]
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.