Skip to content

Commit de77e57

Browse files
Merge pull request openshift#285 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents 4966e0b + 5128b59 commit de77e57

File tree

9 files changed

+212
-12
lines changed

9 files changed

+212
-12
lines changed

.bingo/Variables.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ $(OPERATOR_SDK): $(BINGO_DIR)/operator-sdk.mod
7171
@echo "(re)installing $(GOBIN)/operator-sdk-v1.39.1"
7272
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -ldflags=-X=github.com/operator-framework/operator-sdk/internal/version.Version=v1.34.1 -mod=mod -modfile=operator-sdk.mod -o=$(GOBIN)/operator-sdk-v1.39.1 "github.com/operator-framework/operator-sdk/cmd/operator-sdk"
7373

74-
OPM := $(GOBIN)/opm-v1.50.0
74+
OPM := $(GOBIN)/opm-v1.51.0
7575
$(OPM): $(BINGO_DIR)/opm.mod
7676
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
77-
@echo "(re)installing $(GOBIN)/opm-v1.50.0"
78-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=opm.mod -o=$(GOBIN)/opm-v1.50.0 "github.com/operator-framework/operator-registry/cmd/opm"
77+
@echo "(re)installing $(GOBIN)/opm-v1.51.0"
78+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=opm.mod -o=$(GOBIN)/opm-v1.51.0 "github.com/operator-framework/operator-registry/cmd/opm"
7979

80-
SETUP_ENVTEST := $(GOBIN)/setup-envtest-v0.0.0-20250217160221-5e8256e05002
80+
SETUP_ENVTEST := $(GOBIN)/setup-envtest-v0.0.0-20250226022829-9d8d219840a4
8181
$(SETUP_ENVTEST): $(BINGO_DIR)/setup-envtest.mod
8282
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
83-
@echo "(re)installing $(GOBIN)/setup-envtest-v0.0.0-20250217160221-5e8256e05002"
84-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=setup-envtest.mod -o=$(GOBIN)/setup-envtest-v0.0.0-20250217160221-5e8256e05002 "sigs.k8s.io/controller-runtime/tools/setup-envtest"
83+
@echo "(re)installing $(GOBIN)/setup-envtest-v0.0.0-20250226022829-9d8d219840a4"
84+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=setup-envtest.mod -o=$(GOBIN)/setup-envtest-v0.0.0-20250226022829-9d8d219840a4 "sigs.k8s.io/controller-runtime/tools/setup-envtest"
8585

.bingo/opm.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ toolchain go1.23.4
66

77
replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
88

9-
require github.com/operator-framework/operator-registry v1.50.0 // cmd/opm
9+
require github.com/operator-framework/operator-registry v1.51.0 // cmd/opm

.bingo/opm.sum

Lines changed: 95 additions & 0 deletions
Large diffs are not rendered by default.

.bingo/setup-envtest.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ go 1.23.0
44

55
toolchain go1.23.4
66

7-
require sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250217160221-5e8256e05002
7+
require sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250226022829-9d8d219840a4

.bingo/setup-envtest.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,7 @@ sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250114080233-1ec7c1b
9595
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250114080233-1ec7c1b76e98/go.mod h1:Is2SwCWbWAoyGVoVBA627n1SWhWaEwUhaIYSEbtzHT4=
9696
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250217160221-5e8256e05002 h1:vl1ohLP3ehNsJc/6X21vexTkPsH2jFHq1sPCATw15IU=
9797
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250217160221-5e8256e05002/go.mod h1:QXw4XLB4ayZHsgXTf7cdyGzacNz9KQsdiI6apU+K07E=
98+
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250226022829-9d8d219840a4 h1:/esRUCAd/0ujMip84n2e2j/lDDYe84EOLDSeQToREZw=
99+
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250226022829-9d8d219840a4/go.mod h1:QXw4XLB4ayZHsgXTf7cdyGzacNz9KQsdiI6apU+K07E=
98100
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
99101
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

.bingo/variables.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ KUSTOMIZE="${GOBIN}/kustomize-v4.5.7"
2626

2727
OPERATOR_SDK="${GOBIN}/operator-sdk-v1.39.1"
2828

29-
OPM="${GOBIN}/opm-v1.50.0"
29+
OPM="${GOBIN}/opm-v1.51.0"
3030

31-
SETUP_ENVTEST="${GOBIN}/setup-envtest-v0.0.0-20250217160221-5e8256e05002"
31+
SETUP_ENVTEST="${GOBIN}/setup-envtest-v0.0.0-20250226022829-9d8d219840a4"
3232

commitchecker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
expectedMergeBase: 01755a80c407b4452e64d816e18e00c189162c4b
1+
expectedMergeBase: 63472e0c16e887814fdb71f33013fd877a8dcf25
22
upstreamBranch: main
33
upstreamOrg: operator-framework
44
upstreamRepo: operator-controller

docs/draft/project/personas.md

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
# OLM Personas
2+
3+
This document attempts to identify essential roles in the OLM lifecycle and associate the duties logically performed by each role. Though some roles can be (and even may typically be) performed by the same actor, they are logically distinct roles with different goals.
4+
5+
OLM roles are broadly categorized here as **Producers** or **Consumers**, indicating whether that role typically is producing content for use in the ecosystem or is using (consuming) content.
6+
7+
# Consumers
8+
## Cluster Admin
9+
*Who is it?*
10+
11+
This role encompasses the basic full-permissions-required creation/maintenance of a cluster, and any non-OLM-ecosystem activities, such as creating, scaling, and upgrading a cluster.
12+
13+
*What does it do?*
14+
15+
- Creates cluster
16+
- Scales cluster
17+
- Miscellaneous Cluster Administration
18+
- Upgrades cluster
19+
20+
## Cluster Extension Admin
21+
*Who is it?*
22+
23+
This role encompasses privileged operations required for OLMv1 and associated operators to deploy workloads to the cluster. This role may exist as a set of activities executed by a cluster admin, but also may operate independently of that role, depending on the necessary privileges.
24+
Here `extension` represents any individual OLMv1 installable, including (but not limited to) `registry+v1` bundles.
25+
26+
*What does it do?*
27+
28+
- Creates enabling infrastructure for extension lifecycle (service accounts, etc.)
29+
- Installs extensions
30+
- Upgrades extensions
31+
- Removes extensions
32+
- Browses extensions offered in installed `ClusterCatalogs`
33+
- Derives minimum privilege for installation
34+
- filters visibility on installable extensions
35+
- Verifies that extension health is detectable to desired sensors
36+
37+
## Cluster Catalog Admin
38+
*Who is it?*
39+
40+
This role encompasses the control of `ClusterCatalogs` on the running cluster. This role may exist as a set of activities executed by a cluster admin, but also may operate independently of that role, depending on the necessary privileges. This role is a collaboration with **Catalog Curators** and may also interact with **Catalog Manipulators**
41+
42+
*What does it do?*
43+
44+
- Adds/removes/updates catalogs
45+
- Enables/disables catalogs
46+
- Configures pull secrets necessary to access extensions from catalogs
47+
48+
## Cluster Monitors
49+
*Who is it?*
50+
51+
This role represents any actor which monitors the status of the cluster and installed workloads. This may include
52+
- Platform status
53+
- Extension health
54+
- Diagnostic notifications
55+
56+
57+
# Producers
58+
## Extension Author
59+
*Who is it?*
60+
61+
This role encompasses folks who want to create an extension. It interacts with other **Producer** roles by generating a _catalog contribution_ to make extensions available on-cluster to **Cluster Extension Admins**. For example, a catalog contribution for a registry+v1 bundle is one/more bundle image and the upgrade graph expressed in [FBC](https://olm.operatorframework.io/docs/reference/file-based-catalogs/).
62+
63+
*What does it do?*
64+
- Creates extension
65+
- Builds/releases extension
66+
- Validates extension
67+
- Adjusts upgrade graph
68+
- Publishes artifacts (i.e. images for registry+v1 bundle)
69+
70+
## Contribution Curator
71+
*Who is it?*
72+
73+
This role is responsible for taking catalog contributions from **Extension Authors**, applying any changes necessary for publication, and supplying the resulting artifacts to the **Catalog Curator**. This role is frequently fulfilled by different developers than **Extension Authors**.
74+
75+
*What does it do?*
76+
- Validates contributions
77+
- Publishes contributions to registry
78+
79+
## Catalog Curator
80+
*Who is it?*
81+
82+
This role is responsible for publishing a catalog index image to be used by **Consumers** to make workloads available on-cluster. Typically this role operates over multiple extensions, versions, and versioned releases of the final, published catalog.
83+
84+
*What does it do?*
85+
- Aggregates contributions
86+
- Validates aggregate catalog
87+
- Publishes aggregate catalog
88+
89+
## Catalog Manipulator
90+
*Who is it?*
91+
92+
This role is a general category for users who consume published catalogs and re-publish them in some way. Possible use-cases include
93+
- Restricting available extension versions
94+
- Providing enclave services to disconnected environments
95+
- Reducing catalog size by restricting the number of included extensions
96+
97+
*What does it do?*
98+
- Filters content
99+
- Defines content access mapping to new environments (if modified)
100+
- Provides catalog access in restricted environments
101+
102+
103+

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ markdown2==2.5.3
1414
MarkupSafe==3.0.2
1515
mergedeep==1.3.4
1616
mkdocs==1.6.1
17-
mkdocs-material==9.6.5
17+
mkdocs-material==9.6.7
1818
mkdocs-material-extensions==1.3.1
1919
packaging==24.2
2020
paginate==0.5.7

0 commit comments

Comments
 (0)