Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: puppetlabs/puppetlabs-kubernetes
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.0.1
Choose a base ref
...
head repository: puppetlabs/puppetlabs-kubernetes
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.0.2
Choose a head ref
  • 7 commits
  • 3 files changed
  • 4 contributors

Commits on Jan 30, 2018

  1. (CLOUD-1640) Remove package resource for kubernetes-cni (#53) 

    Prior to this commit, kubernetes-cni was installed as a separate
package resource.  Regardless of the version specified, yum would
detect the kubelet prerequisite, which would automatically pull the
latest version.  Since we install kubelet just a few lines later,
and that installation will automatically pull the needed version
of kubernetes-cni, this package resource appears to not be needed,
and causes the incorrect version to get installed.

Removing it resolved the errors since the needed dependencies will be
pulled in when kubelet is installed.

would automatically pull in the most recent version
    @abottchen @scotty-c
    abottchen authored and scotty-c committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    fe5d286 View commit details
    Browse the repository at this point in the history

  2. Revert "(CLOUD-1640) Remove package resource for kubernetes-cni (#53)" 

    This reverts commit fe5d286.
    @scotty-c
    scotty-c authored Jan 30, 2018
    Configuration menu
    Copy the full SHA
    b2e3c1c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #54 from puppetlabs/revert-53-cloud-1640-package-m… 

    …ismatch

Revert "(CLOUD-1640) Remove package resource for kubernetes-cni"
    @davejrt
    davejrt authored Jan 30, 2018
    Configuration menu
    Copy the full SHA
    699e0bd View commit details
    Browse the repository at this point in the history

  4. Fix to stop RHEL family downgrading cni 

    Fix to stop RHEL family downgrading cni
    @scotty-c
    scotty-c authored Jan 30, 2018
    Configuration menu
    Copy the full SHA
    7531973 View commit details
    Browse the repository at this point in the history

  5. Update params.pp

    @scotty-c
    scotty-c authored Jan 30, 2018
    Configuration menu
    Copy the full SHA
    c4a834f View commit details
    Browse the repository at this point in the history

  6. Merge pull request #55 from puppetlabs/scotty-c-cni-fix 

    Fix to stop RHEL family downgrading cni
    @davejrt
    davejrt authored Jan 30, 2018
    Configuration menu
    Copy the full SHA
    96c18a2 View commit details
    Browse the repository at this point in the history

  7. release 1.0.2

    scott coulton committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    b55e5cf View commit details
    Browse the repository at this point in the history
Loading