Skip to content
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

Upstream sync #187

Closed
wants to merge 49 commits into from
Closed

Upstream sync #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
a1fb36d
.github/workflows: Fix the release quickstart.yaml GH action
timflannagan Jul 8, 2021
2aac21c
Expose errors generated while retrieving catalog content.
benluddy Jul 26, 2021
cbc87e6
v0.18.3 OLM release
timflannagan Jul 8, 2021
f274faf
Update containerd dependency to fix vulnerabilities (#719)
dinhxuanvu Jul 28, 2021
bfa9b22
doc/design: Update the changelog release documentation (#2298)
timflannagan Jul 28, 2021
600d1c2
.github/workflows: Avoid running the e2e-tests workflow on doc-only p…
timflannagan Jul 29, 2021
a1ffbf2
don't return an error if the singleton rbac doesn't exist (#2309)
ecordell Jul 31, 2021
60fe57b
let net.Listen pick a port for grpc servers generated in tests (#2310)
ecordell Jul 31, 2021
9792974
internal/declcfg: Avoid processing the .indexignore file when walking…
timflannagan Aug 3, 2021
4900eb2
setup multi-arch builds with goreleaser
joelanford Jul 15, 2021
99a7a1f
Move operator caching from resolver into a new package. (#2316)
benluddy Aug 5, 2021
f0217cb
add further console customization types
dmesser Aug 5, 2021
882460c
.github/workflows: Replace the e2e-kind job name with e2e in the test…
timflannagan Aug 5, 2021
ba28d2f
feat: support removing the default channel head in deprecatetrunace (…
exdx Aug 11, 2021
e187a72
feat(release): X.Y, X, and latest opm image tags (#738)
Aug 11, 2021
c97b9c5
add further console customization types (#2319)
dmesser Aug 16, 2021
c30ba9c
cli doc: opm serve does not detect DC changes after startup (#750)
joelanford Aug 16, 2021
9ad4597
Add joelanford as an approver in OWNERS (#751)
kevinrizza Aug 16, 2021
6bcccb7
Prune API of the resolver package. (#2330)
benluddy Aug 18, 2021
cb3d9a7
Add vu dinh to OLM approvers (#2332)
kevinrizza Aug 18, 2021
b0f0c92
Use of/gini instead of inifrance/gini (#2331)
kevinrizza Aug 18, 2021
ff35766
Fix upstream-opm-builder (#758)
kevinrizza Aug 19, 2021
a9f42e1
feat(opm): configure diff to not include dependency bundles with --sk…
Aug 19, 2021
0e7d985
move internal to alpha to make subpackages available for importing fr…
joelanford Aug 19, 2021
6ef0755
fix broken URL in unit.yaml GH action (#2335)
josefkarasek Aug 24, 2021
4441e74
bump gini (#2336)
ecordell Aug 26, 2021
e8ed9cd
(fix) : Fix check to verify OCP label versions when it is =v4.x (#148)
camilamacedo86 Aug 27, 2021
0e9cefc
Fix 2327: Detecting OLM existence before start to install (#2334)
morningspace Aug 31, 2021
8236403
update default scaffolded opm base image (#762)
joelanford Aug 31, 2021
8bb3734
fix: ensure operator images are included in rendered bundles related …
joelanford Sep 1, 2021
3a6c320
Reduce resolver dependencies on operator-registry and operator-lifecy…
benluddy Sep 1, 2021
f2654b8
Remove unneeded replace pin for sigs.k8s.io/structured-merge-diff (#2…
timflannagan Sep 2, 2021
0f30a19
Add Timestamp to Scorecard Test Results (#137)
Sep 2, 2021
a4c39af
Add validation for Kind and APIVersion (#152)
josefkarasek Sep 3, 2021
ba4472f
Remove hardcoded references to the registry gRPC API from the resolve…
benluddy Sep 7, 2021
6074bdf
modified the controller-runtime and controller-tools versions (#154)
laxmikantbpandhare Sep 8, 2021
b9bda81
chore: update manifests
ankitathomas Sep 9, 2021
a60d1b5
.github/workflows: Separate out the e2e jobs into workflows (#2158)
timflannagan Sep 8, 2021
a75207d
doc(readme): add chat badge (#2345)
njhale Sep 8, 2021
b02d365
Bump OLM_VERSION to 0.19.0 (#2348)
timflannagan Sep 8, 2021
7228774
chore: update manifests
ankitathomas Sep 9, 2021
a74df64
fix(release): upgrade goreleaser so script requests correct checksum …
Sep 8, 2021
a46c27f
.github/workflows: Don't run CI checks for markdown-only updates (#2347)
timflannagan Sep 8, 2021
01afbfc
feat(opm): fine-grained dependency selection in diffs (#756)
Sep 9, 2021
7fb1e3e
test/e2e: Remove the unused e2e.sh and tap.jq files (#2366)
timflannagan Sep 21, 2021
a61d0e5
Add olm-managed label to configmap-based catalogsource for e2e test (…
dinhxuanvu Sep 22, 2021
71362be
Makefile: Explicitly specify GINKGO_OPTS for the e2e/olm target
timflannagan Sep 30, 2021
1eed8ac
Makefile: Update the e2e target to use ginkgo (#2367)
timflannagan Oct 1, 2021
d399345
pkg/controller: Test commit (#2382)
timflannagan Sep 30, 2021
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
  •  
  •  
  •  
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 "GINKGO_OPTS := -flakeAttempts 3 -randomizeAllSpecs -v --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
198 changes: 174 additions & 24 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