Skip to content

Commit ae92146

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #129 from kevinrizza/upstream-sync-branch
Upstream sync
2 parents 1dc76f0 + ec51a3d commit ae92146

File tree

115 files changed

+4247
-1376
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+4247
-1376
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/openshift/api v0.0.0-20200331152225-585af27e34fd
1515
github.com/operator-framework/api v0.10.1
1616
github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000
17-
github.com/operator-framework/operator-registry v1.13.6
17+
github.com/operator-framework/operator-registry v1.17.5
1818
github.com/spf13/cobra v1.1.3
1919
github.com/stretchr/testify v1.7.0
2020
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0

‎manifests/0000_50_olm_02-services.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ spec:
1414
type: ClusterIP
1515
ports:
1616
- name: https-metrics
17-
port: 8081
17+
port: 8443
1818
protocol: TCP
19-
targetPort: metrics
19+
targetPort: 8443
2020
selector:
2121
app: olm-operator
2222
---
@@ -36,8 +36,8 @@ spec:
3636
type: ClusterIP
3737
ports:
3838
- name: https-metrics
39-
port: 8081
39+
port: 8443
4040
protocol: TCP
41-
targetPort: metrics
41+
targetPort: 8443
4242
selector:
4343
app: catalog-operator

‎manifests/0000_50_olm_07-olm-operator.deployment.ibm-cloud-managed.yaml

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,27 @@ spec:
2222
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
2323
spec:
2424
serviceAccountName: olm-operator-serviceaccount
25+
volumes:
26+
- name: srv-cert
27+
secret:
28+
secretName: olm-operator-serving-cert
29+
- name: profile-collector-cert
30+
secret:
31+
secretName: olm-operator-serving-cert
32+
- name: serving-cert
33+
secret:
34+
secretName: olm-operator-serving-cert
2535
containers:
2636
- name: olm-operator
37+
volumeMounts:
38+
- name: srv-cert
39+
mountPath: "/srv-cert"
40+
readOnly: true
41+
- name: profile-collector-cert
42+
mountPath: "/profile-collector-cert"
43+
readOnly: true
44+
- mountPath: /var/run/secrets/serving-cert
45+
name: serving-cert
2746
command:
2847
- /bin/olm
2948
args:
@@ -34,24 +53,26 @@ spec:
3453
- --writePackageServerStatusName
3554
- operator-lifecycle-manager-packageserver
3655
- --tls-cert
37-
- /var/run/secrets/serving-cert/tls.crt
56+
- /srv-cert/tls.crt
3857
- --tls-key
39-
- /var/run/secrets/serving-cert/tls.key
58+
- /srv-cert/tls.key
59+
- --client-ca
60+
- /profile-collector-cert/tls.crt
4061
image: quay.io/operator-framework/olm@sha256:de396b540b82219812061d0d753440d5655250c621c753ed1dc67d6154741607
4162
imagePullPolicy: IfNotPresent
4263
ports:
43-
- containerPort: 8080
44-
- containerPort: 8081
64+
- containerPort: 8443
4565
name: metrics
46-
protocol: TCP
4766
livenessProbe:
4867
httpGet:
4968
path: /healthz
50-
port: 8080
69+
port: 8443
70+
scheme: HTTPS
5171
readinessProbe:
5272
httpGet:
5373
path: /healthz
54-
port: 8080
74+
port: 8443
75+
scheme: HTTPS
5576
terminationMessagePolicy: FallbackToLogsOnError
5677
env:
5778
- name: OPERATOR_NAMESPACE
@@ -66,9 +87,6 @@ spec:
6687
requests:
6788
cpu: 10m
6889
memory: 160Mi
69-
volumeMounts:
70-
- mountPath: /var/run/secrets/serving-cert
71-
name: serving-cert
7290
nodeSelector:
7391
kubernetes.io/os: linux
7492
tolerations:
@@ -84,7 +102,3 @@ spec:
84102
operator: Exists
85103
tolerationSeconds: 120
86104
priorityClassName: system-cluster-critical
87-
volumes:
88-
- name: serving-cert
89-
secret:
90-
secretName: olm-operator-serving-cert

‎manifests/0000_50_olm_07-olm-operator.deployment.yaml

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,27 @@ spec:
2323
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
2424
spec:
2525
serviceAccountName: olm-operator-serviceaccount
26+
volumes:
27+
- name: srv-cert
28+
secret:
29+
secretName: olm-operator-serving-cert
30+
- name: profile-collector-cert
31+
secret:
32+
secretName: olm-operator-serving-cert
33+
- name: serving-cert
34+
secret:
35+
secretName: olm-operator-serving-cert
2636
containers:
2737
- name: olm-operator
38+
volumeMounts:
39+
- name: srv-cert
40+
mountPath: "/srv-cert"
41+
readOnly: true
42+
- name: profile-collector-cert
43+
mountPath: "/profile-collector-cert"
44+
readOnly: true
45+
- mountPath: /var/run/secrets/serving-cert
46+
name: serving-cert
2847
command:
2948
- /bin/olm
3049
args:
@@ -35,24 +54,26 @@ spec:
3554
- --writePackageServerStatusName
3655
- operator-lifecycle-manager-packageserver
3756
- --tls-cert
38-
- /var/run/secrets/serving-cert/tls.crt
57+
- /srv-cert/tls.crt
3958
- --tls-key
40-
- /var/run/secrets/serving-cert/tls.key
59+
- /srv-cert/tls.key
60+
- --client-ca
61+
- /profile-collector-cert/tls.crt
4162
image: quay.io/operator-framework/olm@sha256:de396b540b82219812061d0d753440d5655250c621c753ed1dc67d6154741607
4263
imagePullPolicy: IfNotPresent
4364
ports:
44-
- containerPort: 8080
45-
- containerPort: 8081
65+
- containerPort: 8443
4666
name: metrics
47-
protocol: TCP
4867
livenessProbe:
4968
httpGet:
5069
path: /healthz
51-
port: 8080
70+
port: 8443
71+
scheme: HTTPS
5272
readinessProbe:
5373
httpGet:
5474
path: /healthz
55-
port: 8080
75+
port: 8443
76+
scheme: HTTPS
5677
terminationMessagePolicy: FallbackToLogsOnError
5778
env:
5879
- name: OPERATOR_NAMESPACE
@@ -67,9 +88,6 @@ spec:
6788
requests:
6889
cpu: 10m
6990
memory: 160Mi
70-
volumeMounts:
71-
- mountPath: /var/run/secrets/serving-cert
72-
name: serving-cert
7391
nodeSelector:
7492
kubernetes.io/os: linux
7593
node-role.kubernetes.io/master: ""
@@ -86,7 +104,3 @@ spec:
86104
operator: Exists
87105
tolerationSeconds: 120
88106
priorityClassName: system-cluster-critical
89-
volumes:
90-
- name: serving-cert
91-
secret:
92-
secretName: olm-operator-serving-cert

‎manifests/0000_50_olm_08-catalog-operator.deployment.ibm-cloud-managed.yaml

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,37 +22,59 @@ spec:
2222
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
2323
spec:
2424
serviceAccountName: olm-operator-serviceaccount
25+
volumes:
26+
- name: srv-cert
27+
secret:
28+
secretName: catalog-operator-serving-cert
29+
- name: profile-collector-cert
30+
secret:
31+
secretName: catalog-operator-serving-cert
32+
- name: serving-cert
33+
secret:
34+
secretName: catalog-operator-serving-cert
2535
containers:
2636
- name: catalog-operator
37+
volumeMounts:
38+
- name: srv-cert
39+
mountPath: "/srv-cert"
40+
readOnly: true
41+
- name: profile-collector-cert
42+
mountPath: "/profile-collector-cert"
43+
readOnly: true
44+
- mountPath: /var/run/secrets/serving-cert
45+
name: serving-cert
2746
command:
2847
- /bin/catalog
2948
args:
3049
- '-namespace'
3150
- openshift-marketplace
3251
- -configmapServerImage=quay.io/operator-framework/configmap-operator-registry:latest
52+
- -opmImage=quay.io/operator-framework/configmap-operator-registry:latest
3353
- -util-image
3454
- quay.io/operator-framework/olm@sha256:de396b540b82219812061d0d753440d5655250c621c753ed1dc67d6154741607
3555
- -writeStatusName
3656
- operator-lifecycle-manager-catalog
37-
- -tls-cert
38-
- /var/run/secrets/serving-cert/tls.crt
39-
- -tls-key
40-
- /var/run/secrets/serving-cert/tls.key
57+
- --tls-cert
58+
- /srv-cert/tls.crt
59+
- --tls-key
60+
- /srv-cert/tls.key
61+
- --client-ca
62+
- /profile-collector-cert/tls.crt
4163
image: quay.io/operator-framework/olm@sha256:de396b540b82219812061d0d753440d5655250c621c753ed1dc67d6154741607
4264
imagePullPolicy: IfNotPresent
4365
ports:
44-
- containerPort: 8080
45-
- containerPort: 8081
66+
- containerPort: 8443
4667
name: metrics
47-
protocol: TCP
4868
livenessProbe:
4969
httpGet:
5070
path: /healthz
51-
port: 8080
71+
port: 8443
72+
scheme: HTTPS
5273
readinessProbe:
5374
httpGet:
5475
path: /healthz
55-
port: 8080
76+
port: 8443
77+
scheme: HTTPS
5678
terminationMessagePolicy: FallbackToLogsOnError
5779
resources:
5880
requests:
@@ -61,9 +83,6 @@ spec:
6183
env:
6284
- name: RELEASE_VERSION
6385
value: "0.0.1-snapshot"
64-
volumeMounts:
65-
- mountPath: /var/run/secrets/serving-cert
66-
name: serving-cert
6786
nodeSelector:
6887
kubernetes.io/os: linux
6988
tolerations:
@@ -79,7 +98,3 @@ spec:
7998
operator: Exists
8099
tolerationSeconds: 120
81100
priorityClassName: system-cluster-critical
82-
volumes:
83-
- name: serving-cert
84-
secret:
85-
secretName: catalog-operator-serving-cert

‎manifests/0000_50_olm_08-catalog-operator.deployment.yaml

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,37 +23,59 @@ spec:
2323
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
2424
spec:
2525
serviceAccountName: olm-operator-serviceaccount
26+
volumes:
27+
- name: srv-cert
28+
secret:
29+
secretName: catalog-operator-serving-cert
30+
- name: profile-collector-cert
31+
secret:
32+
secretName: catalog-operator-serving-cert
33+
- name: serving-cert
34+
secret:
35+
secretName: catalog-operator-serving-cert
2636
containers:
2737
- name: catalog-operator
38+
volumeMounts:
39+
- name: srv-cert
40+
mountPath: "/srv-cert"
41+
readOnly: true
42+
- name: profile-collector-cert
43+
mountPath: "/profile-collector-cert"
44+
readOnly: true
45+
- mountPath: /var/run/secrets/serving-cert
46+
name: serving-cert
2847
command:
2948
- /bin/catalog
3049
args:
3150
- '-namespace'
3251
- openshift-marketplace
3352
- -configmapServerImage=quay.io/operator-framework/configmap-operator-registry:latest
53+
- -opmImage=quay.io/operator-framework/configmap-operator-registry:latest
3454
- -util-image
3555
- quay.io/operator-framework/olm@sha256:de396b540b82219812061d0d753440d5655250c621c753ed1dc67d6154741607
3656
- -writeStatusName
3757
- operator-lifecycle-manager-catalog
38-
- -tls-cert
39-
- /var/run/secrets/serving-cert/tls.crt
40-
- -tls-key
41-
- /var/run/secrets/serving-cert/tls.key
58+
- --tls-cert
59+
- /srv-cert/tls.crt
60+
- --tls-key
61+
- /srv-cert/tls.key
62+
- --client-ca
63+
- /profile-collector-cert/tls.crt
4264
image: quay.io/operator-framework/olm@sha256:de396b540b82219812061d0d753440d5655250c621c753ed1dc67d6154741607
4365
imagePullPolicy: IfNotPresent
4466
ports:
45-
- containerPort: 8080
46-
- containerPort: 8081
67+
- containerPort: 8443
4768
name: metrics
48-
protocol: TCP
4969
livenessProbe:
5070
httpGet:
5171
path: /healthz
52-
port: 8080
72+
port: 8443
73+
scheme: HTTPS
5374
readinessProbe:
5475
httpGet:
5576
path: /healthz
56-
port: 8080
77+
port: 8443
78+
scheme: HTTPS
5779
terminationMessagePolicy: FallbackToLogsOnError
5880
resources:
5981
requests:
@@ -62,9 +84,6 @@ spec:
6284
env:
6385
- name: RELEASE_VERSION
6486
value: "0.0.1-snapshot"
65-
volumeMounts:
66-
- mountPath: /var/run/secrets/serving-cert
67-
name: serving-cert
6887
nodeSelector:
6988
kubernetes.io/os: linux
7089
node-role.kubernetes.io/master: ""
@@ -81,7 +100,3 @@ spec:
81100
operator: Exists
82101
tolerationSeconds: 120
83102
priorityClassName: system-cluster-critical
84-
volumes:
85-
- name: serving-cert
86-
secret:
87-
secretName: catalog-operator-serving-cert

‎staging/api/pkg/operators/v1alpha1/subscription_types.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ const (
102102

103103
// SubscriptionInstallPlanFailed indicates that the installation of a Subscription's InstallPlan has failed.
104104
SubscriptionInstallPlanFailed SubscriptionConditionType = "InstallPlanFailed"
105+
106+
// SubscriptionResolutionFailed indicates that the dependency resolution in the namespace in which the subscription is created has failed
107+
SubscriptionResolutionFailed SubscriptionConditionType = "ResolutionFailed"
105108
)
106109

107110
const (

‎staging/operator-lifecycle-manager/.github/workflows/test-scripts.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323
runs-on: ubuntu-latest
2424
steps:
2525
- uses: actions/checkout@v2
26+
- uses: actions/setup-go@v2
27+
with:
28+
go-version: '~1.16'
2629
- run: |
2730
sudo apt-get install conntrack
2831
curl -sLo minikube "$(curl -sL https://api.github.com/repos/kubernetes/minikube/releases/latest | jq -r '[.assets[] | select(.name == "minikube-linux-amd64")] | first | .browser_download_url')"
@@ -34,6 +37,9 @@ jobs:
3437
runs-on: ubuntu-latest
3538
steps:
3639
- uses: actions/checkout@v2
40+
- uses: actions/setup-go@v2
41+
with:
42+
go-version: '~1.16'
3743
- run: |
3844
curl -sLo kind "$(curl -sL https://api.github.com/repos/kubernetes-sigs/kind/releases/latest | jq -r '[.assets[] | select(.name == "kind-linux-amd64")] | first | .browser_download_url')"
3945
chmod +x kind

0 commit comments

Comments
 (0)