USHIFT-367: apply rebase.sh to service-ca manifests #926
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,6 @@ metadata: | |
| app: service-ca | ||
| service-ca: "true" | ||
| spec: | ||
| strategy: | ||
| type: Recreate | ||
| selector: | ||
|
|
@@ -23,45 +22,45 @@ spec: | |
| app: service-ca | ||
| service-ca: "true" | ||
| spec: | ||
| serviceAccountName: service-ca | ||
| containers: | ||
| - name: service-ca-controller | ||
| image: {{ .ReleaseImage.service_ca_operator }} | ||
| imagePullPolicy: IfNotPresent | ||
| command: ["service-ca-operator", "controller"] | ||
| ports: | ||
| - containerPort: 8443 | ||
| securityContext: | ||
| runAsNonRoot: true | ||
| resources: | ||
| requests: | ||
| memory: 120Mi | ||
| cpu: 10m | ||
| volumeMounts: | ||
| - mountPath: /var/run/secrets/signing-key | ||
| name: signing-key | ||
| - mountPath: /var/run/configmaps/signing-cabundle | ||
| name: signing-cabundle | ||
| volumes: | ||
| - name: signing-key | ||
| secret: | ||
| secretName: {{.TLSSecret}} | ||
| - name: signing-cabundle | ||
| configMap: | ||
| name: {{.CAConfigMap}} | ||
| nodeSelector: | ||
| node-role.kubernetes.io/master: "" | ||
|
Comment on lines
+51
to
+52
Contributor
There was a problem hiding this comment. It's unlikely that this was commented out in our code, you may want to figure out why this was here.
Contributor
Author
There was a problem hiding this comment. We originally didn't have node roles set; this was fixed in #869 only recently; we probably missed removing the comment. |
||
| priorityClassName: "system-cluster-critical" | ||
| tolerations: | ||
| - key: node-role.kubernetes.io/master | ||
|
Contributor
There was a problem hiding this comment. again - these whitespaces don't appear in the orig
Contributor
Author
There was a problem hiding this comment. The whitespace change is the result from |
||
| operator: Exists | ||
| effect: "NoSchedule" | ||
| - key: "node.kubernetes.io/unreachable" | ||
| operator: "Exists" | ||
| effect: "NoExecute" | ||
| tolerationSeconds: 120 | ||
| - key: "node.kubernetes.io/not-ready" | ||
| operator: "Exists" | ||
| effect: "NoExecute" | ||
| tolerationSeconds: 120 | ||
| replicas: 1 | ||
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 |
|---|---|---|
|
|
@@ -5,4 +5,3 @@ metadata: | |
| annotations: | ||
| openshift.io/node-selector: "" | ||
| workload.openshift.io/allowed: "management" | ||
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 |
|---|---|---|
|
|
@@ -44,4 +44,4 @@ rules: | |
| verbs: | ||
| - get | ||
| - list | ||
| - watch | ||
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.
this whitespace is not present in https://github.com/openshift/service-ca-operator/blob/master/bindata/v4.0.0/controller/deployment.yaml
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 whitespace change is the result from
yq's reformatting.