Skip to content

Relax and extend polling #1064

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

Closed
perdasilva wants to merge 6 commits into from
Closed

Relax and extend polling #1064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8505836
Upstream: 1675: Add NetworkPolicy as a supported kind
rashmigottipati May 18, 2025
1b90107
Upstream: 3580: add NetworkPolicy as a supported kind
rashmigottipati May 18, 2025
532583c
Upstream: <carry>: Add allow-all networkpolicy for openshift-operator…
anik120 Aug 14, 2025
5fa2213
Upstream: <carry>: regenerate manifests
anik120 Aug 18, 2025
be664de
[WIP] Test: relax polling
Sep 5, 2025
32a505a
update manifests
Sep 5, 2025
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
24 changes: 12 additions & 12 deletions manifests/0000_50_olm_00-clusterserviceversions.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand Down Expand Up @@ -154,7 +154,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand All @@ -176,7 +176,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand Down Expand Up @@ -211,7 +211,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand Down Expand Up @@ -267,7 +267,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand All @@ -289,7 +289,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand Down Expand Up @@ -335,7 +335,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand Down Expand Up @@ -384,7 +384,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand All @@ -406,7 +406,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand Down Expand Up @@ -440,7 +440,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand Down Expand Up @@ -489,7 +489,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand All @@ -511,7 +511,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand Down
19 changes: 19 additions & 0 deletions manifests/0000_50_olm_01-networkpolicies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: default-allow-all
namespace: openshift-operators
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/hypershift: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
spec:
podSelector: {}
policyTypes:
- Ingress
- Egress
ingress:
- {}
egress:
- {}
24 changes: 12 additions & 12 deletions microshift-manifests/0000_50_olm_00-clusterserviceversions.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand Down Expand Up @@ -154,7 +154,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand All @@ -176,7 +176,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand Down Expand Up @@ -211,7 +211,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand Down Expand Up @@ -267,7 +267,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand All @@ -289,7 +289,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand Down Expand Up @@ -335,7 +335,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand Down Expand Up @@ -384,7 +384,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand All @@ -406,7 +406,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand Down Expand Up @@ -440,7 +440,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand Down Expand Up @@ -489,7 +489,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand All @@ -511,7 +511,7 @@ spec:
path:
type: string
value:
description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
Expand Down
19 changes: 19 additions & 0 deletions microshift-manifests/0000_50_olm_01-networkpolicies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: default-allow-all
namespace: openshift-operators
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/hypershift: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
spec:
podSelector: {}
policyTypes:
- Ingress
- Egress
ingress:
- {}
egress:
- {}
1 change: 1 addition & 0 deletions microshift-manifests/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ resources:
- 0000_50_olm_00-pprof-rbac.yaml
- 0000_50_olm_00-pprof-secret.yaml
- 0000_50_olm_00-subscriptions.crd.yaml
- 0000_50_olm_01-networkpolicies.yaml
- 0000_50_olm_01-olm-operator.serviceaccount.yaml
- 0000_50_olm_02-olmconfig.yaml
- 0000_50_olm_02-services.yaml
Expand Down
14 changes: 14 additions & 0 deletions ...ing/operator-lifecycle-manager/deploy/chart/templates/0000_50_olm_01-networkpolicies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: default-allow-all
namespace: {{ .Values.operator_namespace }}
spec:
podSelector: {}
policyTypes:
- Ingress
- Egress
ingress:
- {}
egress:
- {}
2 changes: 2 additions & 0 deletions staging/operator-lifecycle-manager/pkg/controller/operators/catalog/supportedresources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const (
ConsoleQuickStartKind = "ConsoleQuickStart"
ConsoleCLIDownloadKind = "ConsoleCLIDownload"
ConsoleLinkKind = "ConsoleLink"
NetworkPolicyKind = "NetworkPolicy"
)

var supportedKinds = map[string]struct{}{
Expand All @@ -22,6 +23,7 @@ var supportedKinds = map[string]struct{}{
ConsoleQuickStartKind: {},
ConsoleCLIDownloadKind: {},
ConsoleLinkKind: {},
NetworkPolicyKind: {},
}

// isSupported returns true if OLM supports this type of CustomResource.
Expand Down
1 change: 1 addition & 0 deletions staging/operator-lifecycle-manager/test/e2e/collect-ci-artifacts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ commands+=("get operatorgroups -o yaml")
commands+=("get clusterserviceversions -o yaml")
commands+=("get installplans -o yaml")
commands+=("get pods -o wide")
commands+=("get jobs -o wide")
commands+=("get events --sort-by .lastTimestamp")

echo "Storing the test artifact output in the ${TEST_ARTIFACTS_DIR} directory"
Expand Down
Loading