Merge branch 'main' into main-v4

pull/437/head
iwilltry42 4 years ago
commit 3fcc50b205
No known key found for this signature in database
GPG Key ID: 7BA57AD1CFF16110
  1. 2
      docs/usage/guides/calico.md
  2. 4
      docs/usage/guides/calico.yaml
  3. 2
      mkdocs.yml
  4. 2
      pkg/runtimes/docker/translate.go
  5. 2
      pkg/tools/tools.go
  6. 1
      pkg/types/types.go

@ -34,7 +34,7 @@ For watching for the pod(s) deployment
watch "kubectl get pods -n kube-system" watch "kubectl get pods -n kube-system"
``` ```
You will have something like this at begining (with the command line `kubectl get pods -n kube-system`) You will have something like this at beginning (with the command line `kubectl get pods -n kube-system`)
``` ```
NAME READY STATUS RESTARTS AGE NAME READY STATUS RESTARTS AGE
helm-install-traefik-pn84f 0/1 Pending 0 3s helm-install-traefik-pn84f 0/1 Pending 0 3s

@ -2092,7 +2092,7 @@ spec:
type: object type: object
ipipMode: ipipMode:
description: Contains configuration for IPIP tunneling for this pool. description: Contains configuration for IPIP tunneling for this pool.
If not specified, then this is defaulted to "Never" (i.e. IPIP tunelling If not specified, then this is defaulted to "Never" (i.e. IPIP tunneling
is disabled). is disabled).
type: string type: string
nat-outgoing: nat-outgoing:
@ -2112,7 +2112,7 @@ spec:
vxlanMode: vxlanMode:
description: Contains configuration for VXLAN tunneling for this pool. description: Contains configuration for VXLAN tunneling for this pool.
If not specified, then this is defaulted to "Never" (i.e. VXLAN If not specified, then this is defaulted to "Never" (i.e. VXLAN
tunelling is disabled). tunneling is disabled).
type: string type: string
required: required:
- cidr - cidr

@ -30,7 +30,7 @@ theme:
favicon: static/img/favicons_black_blue/favicon.png favicon: static/img/favicons_black_blue/favicon.png
# Navigation # Navigation
# nav: ommitted, because we're using the awesome-pages plugin (https://squidfunk.github.io/mkdocs-material/plugins/awesome-pages/) # nav: omitted, because we're using the awesome-pages plugin (https://squidfunk.github.io/mkdocs-material/plugins/awesome-pages/)
# Extensions # Extensions
markdown_extensions: markdown_extensions:

@ -39,7 +39,6 @@ import (
// TranslateNodeToContainer translates a k3d node specification to a docker container representation // TranslateNodeToContainer translates a k3d node specification to a docker container representation
func TranslateNodeToContainer(node *k3d.Node) (*NodeInDocker, error) { func TranslateNodeToContainer(node *k3d.Node) (*NodeInDocker, error) {
/* initialize everything that we need */ /* initialize everything that we need */
containerConfig := docker.Config{} containerConfig := docker.Config{}
hostConfig := docker.HostConfig{ hostConfig := docker.HostConfig{
@ -195,6 +194,7 @@ func TranslateContainerDetailsToNode(containerDetails types.ContainerJSON) (*k3d
Args: []string{}, // empty, since Cmd already contains flags Args: []string{}, // empty, since Cmd already contains flags
Ports: containerDetails.HostConfig.PortBindings, Ports: containerDetails.HostConfig.PortBindings,
Restart: restart, Restart: restart,
Created: containerDetails.Created,
Labels: labels, Labels: labels,
Network: clusterNetwork, Network: clusterNetwork,
ServerOpts: serverOpts, ServerOpts: serverOpts,

@ -46,7 +46,7 @@ func ImageImportIntoClusterMulti(ctx context.Context, runtime runtimes.Runtime,
runtimeImages, err := runtime.GetImages(ctx) runtimeImages, err := runtime.GetImages(ctx)
if err != nil { if err != nil {
log.Errorln("Failed to fetch list of exsiting images from runtime") log.Errorln("Failed to fetch list of existing images from runtime")
return err return err
} }

@ -300,6 +300,7 @@ type Node struct {
Args []string `yaml:"extraArgs" json:"extraArgs,omitempty"` Args []string `yaml:"extraArgs" json:"extraArgs,omitempty"`
Ports nat.PortMap `yaml:"portMappings" json:"portMappings,omitempty"` Ports nat.PortMap `yaml:"portMappings" json:"portMappings,omitempty"`
Restart bool `yaml:"restart" json:"restart,omitempty"` Restart bool `yaml:"restart" json:"restart,omitempty"`
Created string `yaml:"created" json:"created,omitempty"`
Labels map[string]string // filled automatically Labels map[string]string // filled automatically
Network string // filled automatically Network string // filled automatically
ExtraHosts []string // filled automatically ExtraHosts []string // filled automatically

Loading…
Cancel
Save