Skip to content

OPRUN-3401, OPRUN-3588: Update manifest annotations for GA #74

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
merged 4 commits into from
Nov 21, 2024
Merged

OPRUN-3401, OPRUN-3588: Update manifest annotations for GA #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20f4653
Drop single-node-developer annotations from manifest
Nov 18, 2024
b6084ff
Drop TechPreviewNoUpgrade annotation
Nov 18, 2024
275ad31
Replace api dependency with promotion branch for test
Nov 20, 2024
0799bd5
drop 'include.release.openshift.io/ibm-cloud-managed: "true"' annotation
joelanford Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ require (
sigs.k8s.io/controller-runtime v0.19.0
)

replace github.com/openshift/api => github.com/joelanford/openshift-api v0.0.0-20241119141819-917f3bfd3d28

require (
github.com/Masterminds/semver/v3 v3.3.0 // indirect
github.com/Masterminds/squirrel v1.5.4 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
github.com/joelanford/openshift-api v0.0.0-20241119141819-917f3bfd3d28 h1:O2U0aoxGAmXG+PvZobqv+D3+sue8dtwcEnL9t28k/F4=
github.com/joelanford/openshift-api v0.0.0-20241119141819-917f3bfd3d28/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
Expand Down Expand Up @@ -168,8 +170,6 @@ github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
github.com/openshift/api v0.0.0-20241114175301-1d987ad446cf h1:tFgVKwcH24iKFSF2xERS/payZL1BB/UwEJWeb/OO0xo=
github.com/openshift/api v0.0.0-20241114175301-1d987ad446cf/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
github.com/openshift/build-machinery-go v0.0.0-20241031155326-6ae126a9cb72 h1:kMM+Ea3YFrcoYS76RhhBA7uELy97JM0gwqnyoy7fxco=
github.com/openshift/build-machinery-go v0.0.0-20241031155326-6ae126a9cb72/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
github.com/openshift/client-go v0.0.0-20241107164952-923091dd2b1a h1:h3F55x+zOXwSG4okUlXmOlU/5CQ7Ve2HKxYjseJPVoY=
Expand Down
3 changes: 0 additions & 3 deletions manifests/0000_51_olm_00-olm-operator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ kind: OLM
metadata:
name: cluster
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: "OperatorLifecycleManagerV1"
release.openshift.io/feature-set: TechPreviewNoUpgrade
release.openshift.io/create-only: "true"
spec:
managementState: Managed
Expand Down
3 changes: 0 additions & 3 deletions manifests/0000_51_olm_01_operator_namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ kind: Namespace
metadata:
name: openshift-cluster-olm-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: "OperatorLifecycleManagerV1"
release.openshift.io/feature-set: TechPreviewNoUpgrade
pod-security.kubernetes.io/enforce: restricted
pod-security.kubernetes.io/enforce-version: latest
workload.openshift.io/allowed: "management"
3 changes: 0 additions & 3 deletions manifests/0000_51_olm_02_operator_clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@ kind: ClusterRole
metadata:
name: cluster-olm-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: "OperatorLifecycleManagerV1"
release.openshift.io/feature-set: TechPreviewNoUpgrade
rules:
- apiGroups:
- config.openshift.io
Expand Down
3 changes: 0 additions & 3 deletions manifests/0000_51_olm_03_service_account.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,5 @@ metadata:
namespace: openshift-cluster-olm-operator
name: cluster-olm-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: "OperatorLifecycleManagerV1"
release.openshift.io/feature-set: TechPreviewNoUpgrade
3 changes: 0 additions & 3 deletions manifests/0000_51_olm_04_metrics_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@ metadata:
namespace: openshift-cluster-olm-operator
name: cluster-olm-operator-metrics
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: "OperatorLifecycleManagerV1"
release.openshift.io/feature-set: TechPreviewNoUpgrade
service.alpha.openshift.io/serving-cert-secret-name: cluster-olm-operator-serving-cert
spec:
ports:
Expand Down
3 changes: 0 additions & 3 deletions manifests/0000_51_olm_05_operator_clusterrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: cluster-olm-operator-role
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: "OperatorLifecycleManagerV1"
release.openshift.io/feature-set: TechPreviewNoUpgrade
subjects:
- kind: ServiceAccount
name: cluster-olm-operator
Expand Down
3 changes: 0 additions & 3 deletions manifests/0000_51_olm_06_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ metadata:
namespace: openshift-cluster-olm-operator
name: cluster-olm-operator
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: "OperatorLifecycleManagerV1"
release.openshift.io/feature-set: TechPreviewNoUpgrade
spec:
replicas: 1
selector:
Expand Down
3 changes: 0 additions & 3 deletions manifests/0000_51_olm_07_cluster_operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ kind: ClusterOperator
metadata:
name: olm
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
capability.openshift.io/name: "OperatorLifecycleManagerV1"
release.openshift.io/feature-set: TechPreviewNoUpgrade
spec: {}
status:
versions:
Expand Down
10 changes: 10 additions & 0 deletions vendor/github.com/openshift/api/config/v1/types_cluster_version.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/openshift/api/config/v1/zz_generated.featuregated-crd-manifests.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/openshift/api/features.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/github.com/openshift/api/operator/v1/types_olm.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading