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

ccruntime: Set INSTALL_OFFICIAL_CONTAINERD to false #274

Commits on Nov 3, 2023

  1. controllers: Ensure global env vars are respect for pre/post payloads

    Right now we're just ignoring the global env vars passed, which is not
    the expected behaviour, mainly as we're duplicating a bunch of env vars
    passed to the preInstall / postUninstall payloads.
    
    Let's ensure we actually read the global ones and take those into
    consideration as well.
    
    Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
    fidencio committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    745ee9f View commit details
    Browse the repository at this point in the history
  2. controllers: Ensure NODE_NAME is always set for the payload

    Otherwise we may end up in situations where users will simply try to add
    / replace an environment variable via kustomize and will end up with the
    operator broken as this env var would simply be vanished. :-/
    
    Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
    fidencio committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    f87bd59 View commit details
    Browse the repository at this point in the history
  3. reqs: Set the default value for the passed env vars

    Otherwise we may hit issues in in cases where folks will use kustomize
    to add / replace one the values, as kustomize just overrides the whole
    set of env vars.
    
    We need to keep those in sync with whatever is set in the configs, but
    this shouldn't be as much of a burden as leaving it for the user to do
    so.
    
    Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
    fidencio committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    8907c75 View commit details
    Browse the repository at this point in the history
  4. ccruntime: Set containerd / nydus-snapshotter env vars globally

    In theory those could very well be set only for the pre-install /
    post-uninstall, but that doesn't make much sense as the user experience
    on setting those would be to having to set those twice.
    
    With the user experience in mind, let's just move them to the global env
    vars and let the user set / kustomize them only once.
    
    Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
    fidencio committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    c443135 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. ccruntime: Set INSTALL_OFFICIAL_CONTAINERD to false

    The majority of the managed kubernetes solutions are already relying on
    a new enough (v1.7+) version of containerd.
    
    Fixes: confidential-containers#272
    
    Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
    fidencio committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    475c686 View commit details
    Browse the repository at this point in the history
  2. tests/e2e: handle containerd <= 1.6

    With the new requirement of containerd 1.7+, the operator.sh was adapted
    to enable the operator to install containerd in case the system's
    installed version is less than or equal to 1.6.
    
    Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
    wainersm authored and fidencio committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    d3fc6ea View commit details
    Browse the repository at this point in the history
  3. tests/e2e: installs containerd 1.7 on Ubuntu 22.04

    On Ubuntu 22.04 installs docker from the distro and consequently
    containerd version 1.7. This ways we cover the default installation case where
    INSTALL_OFFICIAL_CONTAINERD=false.
    
    Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
    wainersm authored and fidencio committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    812289b View commit details
    Browse the repository at this point in the history