Skip to content

WIP: Sync latest #126

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
awgreene wants to merge 8 commits into from
Closed

WIP: Sync latest #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d727a5a
declcfg: improve and fix model tests to eliminate possibility of fals…
joelanford Jul 11, 2021
f1d5d4e
Remove pin of etcd and grpc (resolved in etcd v3.5.0).
benluddy Jul 12, 2021
29c1b39
move DC opm commands out of alpha
ankitathomas Jul 12, 2021
aa81e71
Translate legacy "bundle dependencies" to properties.
benluddy Jul 13, 2021
0ffd805
Use one HTTP server for healthz, metrics, and profiling.
benluddy Jun 18, 2021
3e56985
Remove unused trace log from LegacySyncHandler.
benluddy Jul 14, 2021
42243bc
(chore) update manifests
kevinrizza Jul 20, 2021
1e4a6be
(chore) update manifests
awgreene Jul 21, 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
4 changes: 2 additions & 2 deletions manifests/0000_50_olm-06-psm-operator.deployment.ibm-cloud-managed.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ spec:
httpGet:
path: /healthz
port: 8080
initialDelaySeconds: 30
initialDelaySeconds: 30
readinessProbe:
httpGet:
path: /healthz
port: 8080
initialDelaySeconds: 30
initialDelaySeconds: 30
terminationMessagePolicy: FallbackToLogsOnError
nodeSelector:
kubernetes.io/os: linux
Expand Down
4 changes: 2 additions & 2 deletions manifests/0000_50_olm-06-psm-operator.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ spec:
httpGet:
path: /healthz
port: 8080
initialDelaySeconds: 30
initialDelaySeconds: 30
readinessProbe:
httpGet:
path: /healthz
port: 8080
initialDelaySeconds: 30
initialDelaySeconds: 30
terminationMessagePolicy: FallbackToLogsOnError
nodeSelector:
kubernetes.io/os: linux
Expand Down
8 changes: 4 additions & 4 deletions manifests/0000_50_olm_02-services.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ spec:
type: ClusterIP
ports:
- name: https-metrics
port: 8081
port: 8443
protocol: TCP
targetPort: metrics
targetPort: 8443
selector:
app: olm-operator
---
Expand All @@ -36,8 +36,8 @@ spec:
type: ClusterIP
ports:
- name: https-metrics
port: 8081
port: 8443
protocol: TCP
targetPort: metrics
targetPort: 8443
selector:
app: catalog-operator
30 changes: 15 additions & 15 deletions manifests/0000_50_olm_07-olm-operator.deployment.ibm-cloud-managed.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,16 @@ spec:
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
spec:
serviceAccountName: olm-operator-serviceaccount
volumes:
- name: srv-cert
secret:
secretName: olm-operator-serving-cert
containers:
- name: olm-operator
volumeMounts:
- name: srv-cert
mountPath: "/srv-cert"
readOnly: true
command:
- /bin/olm
args:
Expand All @@ -34,24 +42,23 @@ spec:
- --writePackageServerStatusName
- operator-lifecycle-manager-packageserver
- --tls-cert
- /var/run/secrets/serving-cert/tls.crt
- /srv-cert/tls.crt
- --tls-key
- /var/run/secrets/serving-cert/tls.key
- /srv-cert/tls.key
image: quay.io/operator-framework/olm@sha256:de396b540b82219812061d0d753440d5655250c621c753ed1dc67d6154741607
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
- containerPort: 8081
name: metrics
protocol: TCP
- containerPort: 8443
livenessProbe:
httpGet:
path: /healthz
port: 8080
port: 8443
scheme: HTTPS
readinessProbe:
httpGet:
path: /healthz
port: 8080
port: 8443
scheme: HTTPS
terminationMessagePolicy: FallbackToLogsOnError
env:
- name: OPERATOR_NAMESPACE
Expand All @@ -66,9 +73,6 @@ spec:
requests:
cpu: 10m
memory: 160Mi
volumeMounts:
- mountPath: /var/run/secrets/serving-cert
name: serving-cert
nodeSelector:
kubernetes.io/os: linux
tolerations:
Expand All @@ -84,7 +88,3 @@ spec:
operator: Exists
tolerationSeconds: 120
priorityClassName: system-cluster-critical
volumes:
- name: serving-cert
secret:
secretName: olm-operator-serving-cert
30 changes: 15 additions & 15 deletions manifests/0000_50_olm_07-olm-operator.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,16 @@ spec:
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
spec:
serviceAccountName: olm-operator-serviceaccount
volumes:
- name: srv-cert
secret:
secretName: olm-operator-serving-cert
containers:
- name: olm-operator
volumeMounts:
- name: srv-cert
mountPath: "/srv-cert"
readOnly: true
command:
- /bin/olm
args:
Expand All @@ -35,24 +43,23 @@ spec:
- --writePackageServerStatusName
- operator-lifecycle-manager-packageserver
- --tls-cert
- /var/run/secrets/serving-cert/tls.crt
- /srv-cert/tls.crt
- --tls-key
- /var/run/secrets/serving-cert/tls.key
- /srv-cert/tls.key
image: quay.io/operator-framework/olm@sha256:de396b540b82219812061d0d753440d5655250c621c753ed1dc67d6154741607
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
- containerPort: 8081
name: metrics
protocol: TCP
- containerPort: 8443
livenessProbe:
httpGet:
path: /healthz
port: 8080
port: 8443
scheme: HTTPS
readinessProbe:
httpGet:
path: /healthz
port: 8080
port: 8443
scheme: HTTPS
terminationMessagePolicy: FallbackToLogsOnError
env:
- name: OPERATOR_NAMESPACE
Expand All @@ -67,9 +74,6 @@ spec:
requests:
cpu: 10m
memory: 160Mi
volumeMounts:
- mountPath: /var/run/secrets/serving-cert
name: serving-cert
nodeSelector:
kubernetes.io/os: linux
node-role.kubernetes.io/master: ""
Expand All @@ -86,7 +90,3 @@ spec:
operator: Exists
tolerationSeconds: 120
priorityClassName: system-cluster-critical
volumes:
- name: serving-cert
secret:
secretName: olm-operator-serving-cert
34 changes: 17 additions & 17 deletions manifests/0000_50_olm_08-catalog-operator.deployment.ibm-cloud-managed.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,16 @@ spec:
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
spec:
serviceAccountName: olm-operator-serviceaccount
volumes:
- name: srv-cert
secret:
secretName: catalog-operator-serving-cert
containers:
- name: catalog-operator
volumeMounts:
- name: srv-cert
mountPath: "/srv-cert"
readOnly: true
command:
- /bin/catalog
args:
Expand All @@ -34,25 +42,24 @@ spec:
- quay.io/operator-framework/olm@sha256:de396b540b82219812061d0d753440d5655250c621c753ed1dc67d6154741607
- -writeStatusName
- operator-lifecycle-manager-catalog
- -tls-cert
- /var/run/secrets/serving-cert/tls.crt
- -tls-key
- /var/run/secrets/serving-cert/tls.key
- --tls-cert
- /srv-cert/tls.crt
- --tls-key
- /srv-cert/tls.key
image: quay.io/operator-framework/olm@sha256:de396b540b82219812061d0d753440d5655250c621c753ed1dc67d6154741607
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
- containerPort: 8081
name: metrics
protocol: TCP
- containerPort: 8443
livenessProbe:
httpGet:
path: /healthz
port: 8080
port: 8443
scheme: HTTPS
readinessProbe:
httpGet:
path: /healthz
port: 8080
port: 8443
scheme: HTTPS
terminationMessagePolicy: FallbackToLogsOnError
resources:
requests:
Expand All @@ -61,9 +68,6 @@ spec:
env:
- name: RELEASE_VERSION
value: "0.0.1-snapshot"
volumeMounts:
- mountPath: /var/run/secrets/serving-cert
name: serving-cert
nodeSelector:
kubernetes.io/os: linux
tolerations:
Expand All @@ -79,7 +83,3 @@ spec:
operator: Exists
tolerationSeconds: 120
priorityClassName: system-cluster-critical
volumes:
- name: serving-cert
secret:
secretName: catalog-operator-serving-cert
34 changes: 17 additions & 17 deletions manifests/0000_50_olm_08-catalog-operator.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,16 @@ spec:
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
spec:
serviceAccountName: olm-operator-serviceaccount
volumes:
- name: srv-cert
secret:
secretName: catalog-operator-serving-cert
containers:
- name: catalog-operator
volumeMounts:
- name: srv-cert
mountPath: "/srv-cert"
readOnly: true
command:
- /bin/catalog
args:
Expand All @@ -35,25 +43,24 @@ spec:
- quay.io/operator-framework/olm@sha256:de396b540b82219812061d0d753440d5655250c621c753ed1dc67d6154741607
- -writeStatusName
- operator-lifecycle-manager-catalog
- -tls-cert
- /var/run/secrets/serving-cert/tls.crt
- -tls-key
- /var/run/secrets/serving-cert/tls.key
- --tls-cert
- /srv-cert/tls.crt
- --tls-key
- /srv-cert/tls.key
image: quay.io/operator-framework/olm@sha256:de396b540b82219812061d0d753440d5655250c621c753ed1dc67d6154741607
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
- containerPort: 8081
name: metrics
protocol: TCP
- containerPort: 8443
livenessProbe:
httpGet:
path: /healthz
port: 8080
port: 8443
scheme: HTTPS
readinessProbe:
httpGet:
path: /healthz
port: 8080
port: 8443
scheme: HTTPS
terminationMessagePolicy: FallbackToLogsOnError
resources:
requests:
Expand All @@ -62,9 +69,6 @@ spec:
env:
- name: RELEASE_VERSION
value: "0.0.1-snapshot"
volumeMounts:
- mountPath: /var/run/secrets/serving-cert
name: serving-cert
nodeSelector:
kubernetes.io/os: linux
node-role.kubernetes.io/master: ""
Expand All @@ -81,7 +85,3 @@ spec:
operator: Exists
tolerationSeconds: 120
priorityClassName: system-cluster-critical
volumes:
- name: serving-cert
secret:
secretName: catalog-operator-serving-cert
11 changes: 0 additions & 11 deletions scripts/catalog-deployment.patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,3 @@
value:
name: RELEASE_VERSION
value: "0.0.1-snapshot"
- command: update
path: spec.template.spec.containers[0].volumeMounts[+]
value:
mountPath: /var/run/secrets/serving-cert
name: serving-cert
- command: update
path: spec.template.spec.volumes[+]
value:
name: serving-cert
secret:
secretName: catalog-operator-serving-cert
4 changes: 2 additions & 2 deletions scripts/generate_crds_manifests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,12 @@ spec:
httpGet:
path: /healthz
port: 8080
initialDelaySeconds: 30
initialDelaySeconds: 30
readinessProbe:
httpGet:
path: /healthz
port: 8080
initialDelaySeconds: 30
initialDelaySeconds: 30
terminationMessagePolicy: FallbackToLogsOnError
nodeSelector:
kubernetes.io/os: linux
Expand Down
11 changes: 0 additions & 11 deletions scripts/olm-deployment.patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,3 @@
value:
name: RELEASE_VERSION
value: "0.0.1-snapshot"
- command: update
path: spec.template.spec.containers[0].volumeMounts[+]
value:
mountPath: /var/run/secrets/serving-cert
name: serving-cert
- command: update
path: spec.template.spec.volumes[+]
value:
name: serving-cert
secret:
secretName: olm-operator-serving-cert
Loading