Skip to content
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.

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

Sync from upstream 1.8 to downstream 4.10 #334

Merged
merged 22 commits into from
Jan 27, 2022

Commits on Jan 24, 2022

  1. rgw: inject tls certs for bucket notification and topic operations

    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)
    thotz authored and mergify-bot committed Jan 24, 2022
    Configuration menu
    Copy the full SHA
    0a81404 View commit details
    Browse the repository at this point in the history
  2. helm: fix linter issue with end tag

    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)
    travisn authored and mergify-bot committed Jan 24, 2022
    Configuration menu
    Copy the full SHA
    beec916 View commit details
    Browse the repository at this point in the history
  3. helm: update to the latest helm version v3.8

    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)
    travisn authored and mergify-bot committed Jan 24, 2022
    Configuration menu
    Copy the full SHA
    e1fd738 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #9641 from rook/mergify/bp/release-1.8/pr-9565

    rgw: inject tls certs for bucket notification and topic operations (backport #9565)
    mergify[bot] committed Jan 24, 2022
    Configuration menu
    Copy the full SHA
    ae489d7 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2022

  1. Merge pull request #9644 from rook/mergify/bp/release-1.8/pr-9642

    helm: Update CI to the latest helm and fix the linter (backport #9642)
    mergify[bot] committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    3ead186 View commit details
    Browse the repository at this point in the history
  2. pool: check for application already being set

    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)
    travisn authored and mergify-bot committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    f35da8d View commit details
    Browse the repository at this point in the history
  3. Merge pull request #9650 from rook/mergify/bp/release-1.8/pr-9649

    pool: Check for application already being set (backport #9649)
    mergify[bot] committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    9568850 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2022

  1. core: print the stdout on errors

    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)
    leseb authored and mergify-bot committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    d6fd12e View commit details
    Browse the repository at this point in the history
  2. core: add a break line before printing the ceph config

    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)
    leseb authored and mergify-bot committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    50d2402 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #9656 from rook/mergify/bp/release-1.8/pr-9654

    core: fix some nits  (backport #9654)
    mergify[bot] committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    46293b5 View commit details
    Browse the repository at this point in the history
  4. osd: allow for injecting extra env. variables via ConfigMap

    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)
    rzarzynski authored and mergify-bot committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    98e9fe0 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #9657 from rook/mergify/bp/release-1.8/pr-9647

    osd: allow for injecting extra env. variables via ConfigMap (backport #9647)
    mergify[bot] committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    560231a View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2022

  1. osd: merge all osd resources including custom

    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)
    travisn authored and mergify-bot committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    83f627a View commit details
    Browse the repository at this point in the history
  2. csi: bump csi resizer and volume replication images

    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)
    sathieu authored and travisn committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    2cd55d7 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #9664 from rook/mergify/bp/release-1.8/pr-9651

    Bump csi resizer and volume replication images (backport #9651)
    travisn committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    0645de1 View commit details
    Browse the repository at this point in the history
  4. csi: bump csi snapshotter image to v5

    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)
    Madhu-1 authored and travisn committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    1d7fea8 View commit details
    Browse the repository at this point in the history
  5. helm: add annotations and labels for VSC

    add support to specify annotations and
    labels for the volumesnapshotclass.
    
    closes: #9655
    
    Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
    (cherry picked from commit 08dadaa)
    Madhu-1 authored and mergify-bot committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    954624b View commit details
    Browse the repository at this point in the history
  6. csi: check deployment for snapshot controller

    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)
    Madhu-1 authored and travisn committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    8885db9 View commit details
    Browse the repository at this point in the history
  7. csi: add patch permission to volumesnapshotcontents

    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)
    travisn committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    6ca7da2 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #9668 from rook/mergify/bp/release-1.8/pr-9661

    helm: add annotations and labels for VSC (backport #9661)
    mergify[bot] committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    fb05bc2 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #9666 from rook/mergify/bp/release-1.8/pr-9665

    csi: bump csi snapshotter image to v5 (backport #9665)
    travisn committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    ddc86b8 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #9662 from rook/mergify/bp/release-1.8/pr-9658

    osd: Merge all osd resources including custom (backport #9658)
    travisn committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    4c41b5e View commit details
    Browse the repository at this point in the history