Skip to content

sync up future branch with master branch #741

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 20 commits into from
Sep 1, 2021
Merged

sync up future branch with master branch #741

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6a7d017
bump version to 1.8.0 (#716)
Daniel-Fan Jul 19, 2021
7c0149e
apply k8s PreserveUnknownFields into API (#702)
Daniel-Fan Jul 19, 2021
80e4524
build(deps): bump golang from 1.15.7 to 1.16.6 (#710)
dependabot[bot] Jul 19, 2021
42f750c
fix: Make probe more loose (#717)
horis233 Jul 20, 2021
00aeb73
change tag back to latest for base image (#685)
Daniel-Fan Jul 21, 2021
96206fc
refactor ODLM cache to use one pattern of design (#721)
Daniel-Fan Jul 27, 2021
c465c79
Get csv even the installPlan requires Approval (#723)
Daniel-Fan Jul 27, 2021
aa1f42c
perf: shorten initial delay of readness probe (#725)
horis233 Jul 27, 2021
1234047
build(deps): bump golang from 1.16.6 to 1.16.7 (#728)
dependabot[bot] Aug 6, 2021
a56e18d
opt-in of ubi base image automated builds (#727)
Daniel-Fan Aug 6, 2021
63f28d4
add relatedImages to operator CSV (#729)
Daniel-Fan Aug 16, 2021
c932ad9
fix base image file name (#732)
Daniel-Fan Aug 16, 2021
629ce42
bump version to 1.9.0 (#734)
Daniel-Fan Aug 17, 2021
6c84aaa
make operatorconfig optional (#733)
ZhuoxiLi Aug 17, 2021
bbc66c8
build(deps): bump golang from 1.16.7 to 1.17.0 (#735)
dependabot[bot] Aug 18, 2021
31f741f
build: bump k8s dependencies to 1.21 (#736)
horis233 Aug 19, 2021
d687e09
fix: Operator only reconciles when watched subscriptions are updated.…
horis233 Aug 23, 2021
23d4afb
Enable Subscription config in OperandRegistry (#738)
horis233 Aug 23, 2021
816e14e
Trigger build with new base image
Aug 25, 2021
20dadf4
Trigger build with new base image
Aug 25, 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
Prev Previous commit
Next Next commit
add relatedImages to operator CSV (#729) 
* add relatedImages to operator CSV

* follow CICD name convention
  • Loading branch information
@Daniel-Fan
Daniel-Fan authored Aug 16, 2021
commit 63f28d4c41ecd662b6aa6ff72cfa080460fb241e
2 changes: 1 addition & 1 deletion bundle.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=ibm-odlm
LABEL operators.operatorframework.io.bundle.channels.v1=v3
LABEL operators.operatorframework.io.bundle.channel.default.v1=v3
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.9.0
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.10.0+git
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

Expand Down
13 changes: 8 additions & 5 deletions bundle/manifests/operand-deployment-lifecycle-manager.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ metadata:
description: The Operand Deployment Lifecycle Manager provides a Kubernetes CRD-based
API to manage the lifecycle of operands.
olm.skipRange: '>=1.2.0 <1.8.0'
operators.operatorframework.io/builder: operator-sdk-v1.9.0
operators.operatorframework.io/builder: operator-sdk-v1.10.0+git
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/IBM/operand-deployment-lifecycle-manager
support: IBM
Expand Down Expand Up @@ -644,22 +644,22 @@ spec:
image: quay.io/opencloudio/odlm:latest
imagePullPolicy: Always
livenessProbe:
failureThreshold: 10
httpGet:
path: /readyz
port: 8081
initialDelaySeconds: 120
timeoutSeconds: 10
periodSeconds: 60
failureThreshold: 10
timeoutSeconds: 10
name: manager
readinessProbe:
failureThreshold: 10
httpGet:
path: /healthz
port: 8081
initialDelaySeconds: 3
timeoutSeconds: 3
periodSeconds: 20
failureThreshold: 10
timeoutSeconds: 3
resources:
limits:
cpu: 500m
Expand Down Expand Up @@ -718,5 +718,8 @@ spec:
minKubeVersion: 1.19.0
provider:
name: IBM
relatedImages:
- image: quay.io/opencloudio/odlm:1.8.0
name: ODLM_IMAGE
replaces: operand-deployment-lifecycle-manager.v1.7.0
version: 1.8.0
2 changes: 1 addition & 1 deletion bundle/metadata/annotations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ annotations:
operators.operatorframework.io.bundle.package.v1: ibm-odlm
operators.operatorframework.io.bundle.channels.v1: v3
operators.operatorframework.io.bundle.channel.default.v1: v3
operators.operatorframework.io.metrics.builder: operator-sdk-v1.9.0
operators.operatorframework.io.metrics.builder: operator-sdk-v1.10.0+git
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

Expand Down
3 changes: 3 additions & 0 deletions config/manifests/bases/operand-deployment-lifecycle-manager.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,4 +464,7 @@ spec:
minKubeVersion: 1.19.0
provider:
name: IBM
relatedImages:
- image: quay.io/opencloudio/odlm
name: ODLM_IMAGE
version: 0.0.0