Bug 1948714: IBM Cloud manifest profile patch #643
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| apiVersion: apps/v1 | ||
|
Contributor
There was a problem hiding this comment. Would you mind giving me some explanation on how this is going to work? I mean, with this extra manifest here isn't CVO going to create two distinct deployments (
Contributor
Author
There was a problem hiding this comment. Basically for any given installation of openshift only one cluster profile is active. The CVO will only apply manifests that contain an annotation for the active cluster profile. |
||
| kind: Deployment | ||
| metadata: | ||
| annotations: | ||
| config.openshift.io/inject-proxy: cluster-image-registry-operator | ||
| include.release.openshift.io/ibm-cloud-managed: "true" | ||
| name: cluster-image-registry-operator | ||
| namespace: openshift-image-registry | ||
| spec: | ||
| replicas: 1 | ||
| selector: | ||
| matchLabels: | ||
| name: cluster-image-registry-operator | ||
| template: | ||
| metadata: | ||
| labels: | ||
| name: cluster-image-registry-operator | ||
| spec: | ||
| containers: | ||
| - args: | ||
| - --files=/var/run/configmaps/trusted-ca/tls-ca-bundle.pem | ||
| - --files=/etc/secrets/tls.crt | ||
| - --files=/etc/secrets/tls.key | ||
| env: | ||
| - name: RELEASE_VERSION | ||
| value: 0.0.1-snapshot | ||
| - name: WATCH_NAMESPACE | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: metadata.namespace | ||
| - name: OPERATOR_NAME | ||
| value: cluster-image-registry-operator | ||
| - name: IMAGE | ||
| value: docker.io/openshift/origin-docker-registry:latest | ||
| - name: IMAGE_PRUNER | ||
| value: quay.io/openshift/origin-cli:v4.0 | ||
| image: docker.io/openshift/origin-cluster-image-registry-operator:latest | ||
| imagePullPolicy: IfNotPresent | ||
| name: cluster-image-registry-operator | ||
| ports: | ||
| - containerPort: 60000 | ||
| name: metrics | ||
| resources: | ||
| requests: | ||
| cpu: 10m | ||
| memory: 50Mi | ||
| volumeMounts: | ||
| - mountPath: /var/run/configmaps/trusted-ca/ | ||
| name: trusted-ca | ||
| - mountPath: /etc/secrets | ||
| name: image-registry-operator-tls | ||
| - mountPath: /var/run/secrets/openshift/serviceaccount | ||
| name: bound-sa-token | ||
| readOnly: true | ||
| priorityClassName: system-cluster-critical | ||
| serviceAccountName: cluster-image-registry-operator | ||
| shareProcessNamespace: false | ||
| tolerations: | ||
| - effect: NoSchedule | ||
| key: node-role.kubernetes.io/master | ||
| operator: Exists | ||
| - effect: NoExecute | ||
| key: node.kubernetes.io/unreachable | ||
| operator: Exists | ||
| tolerationSeconds: 120 | ||
| - effect: NoExecute | ||
| key: node.kubernetes.io/not-ready | ||
| operator: Exists | ||
| tolerationSeconds: 120 | ||
| volumes: | ||
| - name: image-registry-operator-tls | ||
| secret: | ||
| secretName: image-registry-operator-tls | ||
| - configMap: | ||
| items: | ||
| - key: ca-bundle.crt | ||
| path: tls-ca-bundle.pem | ||
| name: trusted-ca | ||
| optional: true | ||
| name: trusted-ca | ||
| - name: bound-sa-token | ||
| projected: | ||
| sources: | ||
| - serviceAccountToken: | ||
| audience: openshift | ||
| path: token | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| - op: replace | ||
| path: /metadata/annotations | ||
| value: | ||
| config.openshift.io/inject-proxy: cluster-image-registry-operator | ||
| include.release.openshift.io/ibm-cloud-managed: "true" | ||
| - op: remove | ||
| path: /spec/template/spec/nodeSelector |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there any special reason for not going with a newer version? I have noticed here that if it is not set we go for 1.15.2.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The reason I added this here, is that verify previously failed (looks like your CI test is using an older go version):
https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_cluster-image-registry-operator/643/pull-ci-openshift-cluster-image-registry-operator-master-verify/1376950809396252672
Note that this is the minimum version. It's fine to use a newer release.