Skip to content

4.10 downstream/upstream sync - second half #204

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
njhale wants to merge 29 commits into from
Closed

4.10 downstream/upstream sync - second half #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
dfaf4ba
fix: ensure operator images are included in rendered bundles related …
joelanford Sep 1, 2021
5b9e71f
Reduce resolver dependencies on operator-registry and operator-lifecy…
benluddy Sep 1, 2021
5319ac0
Remove unneeded replace pin for sigs.k8s.io/structured-merge-diff (#2…
timflannagan Sep 2, 2021
cc70116
Add Timestamp to Scorecard Test Results (#137)
Sep 2, 2021
c8c8339
Add validation for Kind and APIVersion (#152)
josefkarasek Sep 3, 2021
cca583b
Remove hardcoded references to the registry gRPC API from the resolve…
benluddy Sep 7, 2021
c62dff9
modified the controller-runtime and controller-tools versions (#154)
laxmikantbpandhare Sep 8, 2021
f2eee8d
chore: update manifests
ankitathomas Sep 9, 2021
9696612
.github/workflows: Separate out the e2e jobs into workflows (#2158)
timflannagan Sep 8, 2021
8787a06
doc(readme): add chat badge (#2345)
njhale Sep 8, 2021
459e4b9
Bump OLM_VERSION to 0.19.0 (#2348)
timflannagan Sep 8, 2021
ebe94f5
chore: update manifests
ankitathomas Sep 9, 2021
54d1817
fix(release): upgrade goreleaser so script requests correct checksum …
Sep 8, 2021
99140aa
.github/workflows: Don't run CI checks for markdown-only updates (#2347)
timflannagan Sep 8, 2021
913e950
feat(opm): fine-grained dependency selection in diffs (#756)
Sep 9, 2021
b0c7340
test/e2e: Remove the unused e2e.sh and tap.jq files (#2366)
timflannagan Sep 21, 2021
920131e
Add olm-managed label to configmap-based catalogsource for e2e test (…
Sep 22, 2021
fac3631
Makefile: Update the e2e target to use ginkgo (#2367)
timflannagan Oct 1, 2021
918c16b
pkg/controller: Test commit (#2382)
timflannagan Sep 30, 2021
eeb288e
test(e2e): use server-side apply to update fixture (#2385)
njhale Oct 1, 2021
c7302fa
fix: wrap subscription e2e test logic in Eventually statement (#2392)
exdx Oct 4, 2021
1a0983d
fix(e2e): Using Eventually to check subscription state (#2396)
Oct 5, 2021
a108267
fix(e2e): Remove the PreExistingCRDOwnerIsReplaced e2e test case (#2388)
Oct 5, 2021
faaf711
chore(make): add e2e test options (#2393)
njhale Oct 6, 2021
596ba37
Makefile: Explicitly override the default OLM install and test
timflannagan Sep 30, 2021
01c24dd
test/e2e: Wrap flake-prone garbage collection tests in eventually ass…
timflannagan Oct 6, 2021
c518b8d
fix: wrap csv e2e test create in Eventually statements in the BeforeE…
exdx Oct 8, 2021
0b8fc8d
fix: use v1 pdb object under e2e bundle test (#2398)
exdx Oct 8, 2021
a24122d
Improve reliability of e2e tests that include GRPC CatalogSources (#2…
awgreene Oct 13, 2021
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: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ e2e/operator-registry: ## Run e2e registry tests
$(MAKE) e2e WHAT=operator-registry

e2e/olm: ## Run e2e olm tests
$(MAKE) e2e WHAT=operator-lifecycle-manager
$(MAKE) e2e WHAT=operator-lifecycle-manager E2E_INSTALL_NS=openshift-operator-lifecycle-manager E2E_TEST_NS=openshift-operators E2E_TIMEOUT=120m

.PHONY: vendor
vendor:
Expand Down
16 changes: 8 additions & 8 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@ require (
github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000
github.com/operator-framework/operator-registry v1.17.5
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.1.3
github.com/spf13/cobra v1.2.1
github.com/stretchr/testify v1.7.0
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0
google.golang.org/protobuf v1.27.1
gopkg.in/yaml.v2 v2.4.0
helm.sh/helm/v3 v3.6.2
k8s.io/api v0.22.0
k8s.io/apimachinery v0.22.0
k8s.io/client-go v0.22.0
k8s.io/code-generator v0.22.0
k8s.io/api v0.22.1
k8s.io/apimachinery v0.22.1
k8s.io/client-go v0.22.1
k8s.io/code-generator v0.22.1
k8s.io/kube-openapi v0.0.0-20210527164424-3c818078ee3d
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9
sigs.k8s.io/controller-runtime v0.9.2
sigs.k8s.io/controller-tools v0.6.1
k8s.io/utils v0.0.0-20210802155522-efc7438f0176
sigs.k8s.io/controller-runtime v0.10.0
sigs.k8s.io/controller-tools v0.6.2
)

replace (
Expand Down
194 changes: 172 additions & 22 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion manifests/0000_50_olm_00-catalogsources.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.6.2
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"
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.6.2
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"
Expand Down
2 changes: 1 addition & 1 deletion manifests/0000_50_olm_00-installplans.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.6.2
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"
Expand Down
2 changes: 1 addition & 1 deletion manifests/0000_50_olm_00-operatorconditions.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.6.2
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"
Expand Down
2 changes: 1 addition & 1 deletion manifests/0000_50_olm_00-operatorgroups.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.6.2
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"
Expand Down
2 changes: 1 addition & 1 deletion manifests/0000_50_olm_00-operators.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.6.2
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"
Expand Down
2 changes: 1 addition & 1 deletion manifests/0000_50_olm_00-subscriptions.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
controller-gen.kubebuilder.io/version: v0.6.2
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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/manifests/csv.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: packageserver
namespace: openshift-operator-lifecycle-manager
labels:
olm.version: 0.18.3
olm.version: 0.19.0
olm.clusteroperator.name: operator-lifecycle-manager-packageserver
annotations:
include.release.openshift.io/single-node-developer: "true"
Expand Down Expand Up @@ -152,7 +152,7 @@ spec:
- packageserver
topologyKey: "kubernetes.io/hostname"
maturity: alpha
version: 0.18.3
version: 0.19.0
apiservicedefinitions:
owned:
- group: packages.operators.coreos.com
Expand Down
2 changes: 1 addition & 1 deletion staging/api/crds/operators.coreos.com_catalogsources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.2
creationTimestamp: null
name: catalogsources.operators.coreos.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion staging/api/crds/operators.coreos.com_clusterserviceversions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.2
creationTimestamp: null
name: clusterserviceversions.operators.coreos.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion staging/api/crds/operators.coreos.com_installplans.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.2
creationTimestamp: null
name: installplans.operators.coreos.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion staging/api/crds/operators.coreos.com_operatorconditions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.2
creationTimestamp: null
name: operatorconditions.operators.coreos.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion staging/api/crds/operators.coreos.com_operatorgroups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.2
creationTimestamp: null
name: operatorgroups.operators.coreos.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion staging/api/crds/operators.coreos.com_operators.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.2
creationTimestamp: null
name: operators.operators.coreos.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion staging/api/crds/operators.coreos.com_subscriptions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.2
creationTimestamp: null
name: subscriptions.operators.coreos.com
spec:
Expand Down
14 changes: 7 additions & 7 deletions staging/api/crds/zz_defs.go
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions staging/api/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ require (
github.com/go-bindata/go-bindata/v3 v3.1.3
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.1.3
github.com/spf13/cobra v1.2.1
github.com/stretchr/testify v1.7.0
k8s.io/api v0.22.0
k8s.io/apiextensions-apiserver v0.22.0
k8s.io/apimachinery v0.22.0
k8s.io/client-go v0.22.0
sigs.k8s.io/controller-runtime v0.9.0
sigs.k8s.io/controller-tools v0.6.0
k8s.io/api v0.22.1
k8s.io/apiextensions-apiserver v0.22.1
k8s.io/apimachinery v0.22.1
k8s.io/client-go v0.22.1
sigs.k8s.io/controller-runtime v0.10.0
sigs.k8s.io/controller-tools v0.6.2
)
Loading