Skip to content

Commit

Permalink
Merge pull request #76 from banzaicloud/kernel-modules
Browse files Browse the repository at this point in the history 
Kernel modules
  • Loading branch information
@Ecsy
Ecsy authored Oct 10, 2019
2 parents 7bb9cc4 + 5fd7d63 commit 8e5b13a
Show file tree
Hide file tree
Showing 35 changed files with 91 additions and 82 deletions.
3 changes: 3 additions & 0 deletions .licensei.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,8 @@ approved = [


ignored = [
"emperror.dev/errors",
"github.com/ghodss/yaml",
"go.uber.org/atomic",
"go.uber.org/multierr",
]
2 changes: 1 addition & 1 deletion cmd/pke/app/cmd/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"fmt"
"runtime"

"emperror.dev/errors"
"github.com/banzaicloud/pke/cmd/pke/app/constants"
"github.com/ghodss/yaml"
"github.com/pkg/errors"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/constants/constants.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package constants

import (
"github.com/pkg/errors"
"emperror.dev/errors"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/phases/kubeadm/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
"text/template"
"time"

"emperror.dev/errors"
"github.com/Masterminds/semver"
"github.com/banzaicloud/pke/cmd/pke/app/constants"
"github.com/banzaicloud/pke/cmd/pke/app/util/file"
"github.com/pkg/errors"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/phases/kubeadm/controlplane/controlplane.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"text/template"
"time"

"emperror.dev/errors"
"github.com/Masterminds/semver"
"github.com/banzaicloud/pke/.gen/pipeline"
"github.com/banzaicloud/pke/cmd/pke/app/constants"
Expand All @@ -47,7 +48,6 @@ import (
"github.com/banzaicloud/pke/cmd/pke/app/util/validator"
"github.com/goph/emperror"
"github.com/lestrrat-go/backoff"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/phases/kubeadm/controlplane/kubeadm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ import (
"strings"
"text/template"

"emperror.dev/errors"
"github.com/Masterminds/semver"
"github.com/banzaicloud/pke/cmd/pke/app/constants"
"github.com/banzaicloud/pke/cmd/pke/app/phases/kubeadm"
"github.com/banzaicloud/pke/cmd/pke/app/util/file"
"github.com/banzaicloud/pke/cmd/pke/app/util/kubernetes"
"github.com/pbnjay/memory"
"github.com/pkg/errors"
)

//go:generate templify -t ${GOTMPL} -p controlplane -f kubeadmConfigV1Alpha3 kubeadm_v1alpha3.yaml.tmpl
Expand Down
3 changes: 1 addition & 2 deletions cmd/pke/app/phases/kubeadm/controlplane/kubeadm_v1alpha3.yaml.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ func kubeadmConfigV1Alpha3Template() string {
" oidc-username-claim: \"email\"\n" +
" oidc-username-prefix: \"oidc:\"\n" +
" oidc-groups-claim: \"groups\"{{end}}\n" +
" {{ if .CloudProvider }}\n" +
" cloud-provider: \"{{ .CloudProvider }}\"\n" +
" {{ if .CloudProvider }}cloud-provider: \"{{ .CloudProvider }}\"\n" +
" {{ if .CloudConfig }}cloud-config: /etc/kubernetes/{{ .CloudProvider }}.conf{{end}}{{end}}\n" +
"schedulerExtraArgs:\n" +
" profiling: \"false\"\n" +
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/phases/kubeadm/controlplane/storage_class.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"os/exec"
"text/template"

"emperror.dev/errors"
"github.com/banzaicloud/pke/cmd/pke/app/constants"
"github.com/banzaicloud/pke/cmd/pke/app/util/file"
"github.com/banzaicloud/pke/cmd/pke/app/util/runner"
"github.com/pkg/errors"
)

func applyDefaultStorageClass(out io.Writer, disableDefaultStorageClass bool, cloudProvider string, azureStorageAccountType, azureStorageKind string) error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/phases/kubeadm/node/kubeadm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import (
"strings"
"text/template"

"emperror.dev/errors"
"github.com/Masterminds/semver"
"github.com/banzaicloud/pke/cmd/pke/app/phases/kubeadm"
"github.com/banzaicloud/pke/cmd/pke/app/util/file"
"github.com/banzaicloud/pke/cmd/pke/app/util/kubernetes"
"github.com/pbnjay/memory"
"github.com/pkg/errors"
)

//go:generate templify -t ${GOTMPL} -p node -f kubeadmConfigV1Alpha3 kubeadm_v1alpha3.yaml.tmpl
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/phases/kubeadm/token/create/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ import (
"strings"
"text/tabwriter"

"emperror.dev/errors"
"github.com/banzaicloud/pke/cmd/pke/app/constants"
"github.com/banzaicloud/pke/cmd/pke/app/phases"
"github.com/banzaicloud/pke/cmd/pke/app/phases/kubeadm/token"
"github.com/banzaicloud/pke/cmd/pke/app/util/runner"
"github.com/ghodss/yaml"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/phases/kubeadm/token/list/list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ import (
"os"
"text/tabwriter"

"emperror.dev/errors"
"github.com/banzaicloud/pke/cmd/pke/app/constants"
"github.com/banzaicloud/pke/cmd/pke/app/phases"
"github.com/banzaicloud/pke/cmd/pke/app/phases/kubeadm/token"
"github.com/banzaicloud/pke/cmd/pke/app/util/runner"
"github.com/ghodss/yaml"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/phases/kubeadm/token/token.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"os"
"time"

"emperror.dev/errors"
"github.com/banzaicloud/pke/cmd/pke/app/util/runner"
"github.com/pkg/errors"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/phases/kubeadm/upgrade/controlplane/controlplane.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"fmt"
"io"

"emperror.dev/errors"
"github.com/Masterminds/semver"
"github.com/banzaicloud/pke/cmd/pke/app/constants"
"github.com/banzaicloud/pke/cmd/pke/app/phases"
Expand All @@ -26,7 +27,6 @@ import (
"github.com/banzaicloud/pke/cmd/pke/app/util/linux"
"github.com/banzaicloud/pke/cmd/pke/app/util/runner"
"github.com/banzaicloud/pke/cmd/pke/app/util/validator"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/phases/kubeadm/upgrade/node/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"fmt"
"io"

"emperror.dev/errors"
"github.com/Masterminds/semver"
"github.com/banzaicloud/pke/cmd/pke/app/constants"
"github.com/banzaicloud/pke/cmd/pke/app/phases"
Expand All @@ -26,7 +27,6 @@ import (
"github.com/banzaicloud/pke/cmd/pke/app/util/linux"
"github.com/banzaicloud/pke/cmd/pke/app/util/runner"
"github.com/banzaicloud/pke/cmd/pke/app/util/validator"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/phases/kubeadm/version/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ import (
"fmt"
"io"

"emperror.dev/errors"
"github.com/Masterminds/semver"
"github.com/banzaicloud/pke/cmd/pke/app/constants"
"github.com/banzaicloud/pke/cmd/pke/app/phases"
"github.com/banzaicloud/pke/cmd/pke/app/util/validator"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/phases/pipeline/certificates/certificates.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ import (
"io"
"os"

"emperror.dev/errors"
"github.com/antihax/optional"
"github.com/banzaicloud/pke/.gen/pipeline"
"github.com/banzaicloud/pke/cmd/pke/app/constants"
"github.com/banzaicloud/pke/cmd/pke/app/phases"
"github.com/banzaicloud/pke/cmd/pke/app/phases/kubeadm"
"github.com/banzaicloud/pke/cmd/pke/app/util/file"
pipelineutil "github.com/banzaicloud/pke/cmd/pke/app/util/pipeline"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/phases/pipeline/ready/ready.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ import (
"io/ioutil"
"os"

"emperror.dev/errors"
"github.com/banzaicloud/pke/.gen/pipeline"
"github.com/banzaicloud/pke/cmd/pke/app/constants"
"github.com/banzaicloud/pke/cmd/pke/app/phases"
"github.com/banzaicloud/pke/cmd/pke/app/util/network"
pipelineutil "github.com/banzaicloud/pke/cmd/pke/app/util/pipeline"
"github.com/banzaicloud/pke/cmd/pke/app/util/validator"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/phases/runtime/container/containerd_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"os"
"text/template"

"emperror.dev/errors"
"github.com/banzaicloud/pke/cmd/pke/app/util/file"
"github.com/banzaicloud/pke/cmd/pke/app/util/linux"
"github.com/pkg/errors"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/phases/runtime/container/containerd_other.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package container
import (
"io"

"github.com/pkg/errors"
"emperror.dev/errors"
)

func (r *Runtime) installRuntime(w io.Writer) error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/phases/runtime/kubernetes/kubernetes_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"os"
"path/filepath"

"emperror.dev/errors"
"github.com/banzaicloud/pke/cmd/pke/app/util/file"
"github.com/banzaicloud/pke/cmd/pke/app/util/linux"
"github.com/pkg/errors"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/phases/runtime/kubernetes/kubernetes_other.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package kubernetes
import (
"io"

"github.com/pkg/errors"
"emperror.dev/errors"
)

func (r *Runtime) installRuntime(w io.Writer) error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/util/file/download.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"net/url"
"os"

"github.com/pkg/errors"
"emperror.dev/errors"
)

func Download(u *url.URL, f string) error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/util/file/tar.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"path/filepath"
"syscall"

"github.com/pkg/errors"
"emperror.dev/errors"
)

func Untar(out io.Writer, r io.Reader) error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/util/file/write.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"io/ioutil"
"os"

"github.com/pkg/errors"
"emperror.dev/errors"
)

func Overwrite(file, contents string) error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/pke/app/util/kubernetes/taint.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package kubernetes
import (
"strings"

"github.com/pkg/errors"
"emperror.dev/errors"
)

type Taint struct {
Expand Down
27 changes: 3 additions & 24 deletions cmd/pke/app/util/linux/apt.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"net/url"
"os"

"emperror.dev/errors"
"github.com/Masterminds/semver"
"github.com/banzaicloud/pke/cmd/pke/app/util/file"
"github.com/banzaicloud/pke/cmd/pke/app/util/runner"
"github.com/pkg/errors"
)

const (
Expand All @@ -49,29 +49,8 @@ func (a *AptInstaller) InstallKubernetesPrerequisites(out io.Writer, kubernetesV
return err
}

// modprobe nf_conntrack_ipv4
if err := Modprobe(out, "nf_conntrack_ipv4"); err != nil {
return errors.Wrap(err, "missing nf_conntrack_ipv4 Linux Kernel module")
}

// modprobe ip_vs
if err := Modprobe(out, "ip_vs"); err != nil {
return errors.Wrap(err, "missing ip_vs Linux Kernel module")
}

// modprobe ip_vs_rr
if err := Modprobe(out, "ip_vs_rr"); err != nil {
return errors.Wrap(err, "missing ip_vs_rr Linux Kernel module")
}

// modprobe ip_vs_wrr
if err := Modprobe(out, "ip_vs_wrr"); err != nil {
return errors.Wrap(err, "missing ip_vs_wrr Linux Kernel module")
}

// modprobe ip_vs_sh
if err := Modprobe(out, "ip_vs_sh"); err != nil {
return errors.Wrap(err, "missing ip_vs_sh Linux Kernel module")
if err := ModprobeKubeProxyIPVSModules(out); err != nil {
return err
}

if err := SysctlLoadAllFiles(out); err != nil {
Expand Down
11 changes: 7 additions & 4 deletions cmd/pke/app/util/linux/kernel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,26 @@ package linux
import (
"bytes"
"io"
"io/ioutil"

"emperror.dev/errors"
"github.com/Masterminds/semver"
"github.com/banzaicloud/pke/cmd/pke/app/constants"
"github.com/banzaicloud/pke/cmd/pke/app/util/runner"
"github.com/pkg/errors"
)

func KernelVersionConstraint(out io.Writer, constraint string) error {
// uname -r
version, err := runner.Cmd(out, "uname", "-r").CombinedOutput()
version, err := ioutil.ReadFile("/proc/sys/kernel/osrelease")
if err != nil {
version, err = runner.Cmd(out, "uname", "-r").CombinedOutput()
}
if err != nil {
return err
}
v := string(bytes.TrimSpace(version))
ver, err := semver.NewVersion(v)
if err != nil {
return errors.Wrapf(err, "got version: %s", v)
return errors.Wrapf(err, "got kernel version: %s", v)
}

c, err := semver.NewConstraint(constraint)
Expand Down
Loading

0 comments on commit 8e5b13a

Please sign in to comment.