Sync from upstream 1.8 to downstream 4.10 #334
Merged
Conversation
This file contains 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
The certs for accessing TLS enabled RGW is saved as secrets and inject them if controllers for notification and topics if request is sent to TLS enabled RGW endpoint. Signed-off-by: Jiffin Tony Thottan <thottanjiffin@gmail.com> Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com> (cherry picked from commit a97747c)
Recent versions of helm are failing the linter on the end tag
if the tag is "{{- end -}}". Instead, the correct end tag
is "{{- end }}".
Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
(cherry picked from commit b1a0918)
The CI was building with helm 3.6.2, now updating to the latest v3.8.0 Signed-off-by: Travis Nielsen <tnielsen@redhat.com> (cherry picked from commit 50afb9f)
rgw: inject tls certs for bucket notification and topic operations (backport #9565)
helm: Update CI to the latest helm and fix the linter (backport #9642)
If the pool application is already set, skip setting it again to avoid a warning message being logged that it is already set. Signed-off-by: Travis Nielsen <tnielsen@redhat.com> (cherry picked from commit e0cfb4f)
pool: Check for application already being set (backport #9649)
If we fail fetching the ceph version let's also print the stdout since ceph tends to put the error here too. Signed-off-by: Sébastien Han <seb@redhat.com> (cherry picked from commit e31e4b4)
It's easier to read the config if there is a new line before instead having a truncated version like: ``` 2022-01-26 06:39:41.421373 D | cephclient: config file @ /etc/ceph/ceph.conf: [global] fsid = 0650a1d5-d688-4575-97fc-7b3052a8a3dd mon initial members = a mon host = [v2:10.104.192.209:3300,v1:10.104.192.209:6789] [client.admin] keyring = /var/lib/rook/rook-ceph/client.admin.keyring ``` Now we have: ``` 2022-01-26 06:39:41.421373 D | cephclient: config file @ /etc/ceph/ceph.conf: [global] fsid = 0650a1d5-d688-4575-97fc-7b3052a8a3dd mon initial members = a mon host = [v2:10.104.192.209:3300,v1:10.104.192.209:6789] [client.admin] keyring = /var/lib/rook/rook-ceph/client.admin.keyring ``` Signed-off-by: Sébastien Han <seb@redhat.com> (cherry picked from commit 58c175d)
core: fix some nits (backport #9654)
This patch brings a mechanism to define arbitrary environment variables in OSD containers (both prepare and main ones). It bases on idea proposed by Sebastien Han to use an optional `ConfigMap` instance named `aook-ceph-daemon-env-override` as the source of these settings. The need for the patch comes from the fact that, although crimson finally exposes the same CLI interface as the classical OSD, the broadly used development builds have ASan built in. As ASan, by default, complains if it isn't the very first loaded DSO, we need a way to set the `ASAN_OPTIONS` environment variable to `verify_asan_link_order=0` to mitigate the early aborts. Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com> (cherry picked from commit 17ca41f)
osd: allow for injecting extra env. variables via ConfigMap (backport #9647)
The merging of OSD resource limits and requests assumed that only the cpu and memory resources needed to be merged. It is also possible to set custom resource properties such as intel.com/sriov_net_in: '1' for use with multus, so the merging needs to be more general. Signed-off-by: Travis Nielsen <tnielsen@redhat.com> (cherry picked from commit f9ac966)
Upgraded images: - k8s.gcr.io/sig-storage/csi-resizer: v1.3.0 -> v1.4.0 - quay.io/csiaddons/volumereplication-operator: v0.1.0 -> v0.3.0 Detailed changelogs: - https://github.com/kubernetes-csi/external-resizer/blob/release-1.4/CHANGELOG/CHANGELOG-1.4.md - https://github.com/csi-addons/volume-replication-operator/tree/v0.2.0 - https://github.com/csi-addons/volume-replication-operator/tree/v0.3.0 Signed-off-by: Mathieu Parent <mathieu.parent@insee.fr> (cherry picked from commit 88a449d)
Bump csi resizer and volume replication images (backport #9651)
updating the csi-snapshotter and dependencies to v5.0.1 released version. Co-authored-by: Mathieu Parent <mathieu.parent@insee.fr> Signed-off-by: Madhu Rajanna <madhupr007@gmail.com> (cherry picked from commit cf46615)
The external-snapshotter was deployed as statefulset in 4.x and now its deployed as a deployment. updated the check in CI to make sure deployment is created. Signed-off-by: Madhu Rajanna <madhupr007@gmail.com> (cherry picked from commit 53e12d6)
The update to the snaphots 5.0 controller requires rbac for patching the volumesnapshotcontents. Signed-off-by: Travis Nielsen <tnielsen@redhat.com> (cherry picked from commit 3e4edc0)
helm: add annotations and labels for VSC (backport #9661)
csi: bump csi snapshotter image to v5 (backport #9665)
osd: Merge all osd resources including custom (backport #9658)
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: travisn The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description of your changes:
Pick up the latest changes from upstream 1.8, in particular the CI fix with the 5.x volume snapshotter.
Checklist:
make codegen) has been run to update object specifications, if necessary.