mirrors/k3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

general: properly use variable default object labels

Browse Source
This commit is contained in:
iwilltry42 2021-02-09 14:57:29 +01:00
parent 58d37bea94
commit 601bef45d7
No known key found for this signature in database
GPG Key ID: 7BA57AD1CFF16110
5 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/client/node.go
View File

@ -305,6 +305,9 @@ func NodeCreate(ctx context.Context, runtime runtimes.Runtime, node *k3d.Node, c
for k, v := range k3d.DefaultObjectLabels { for k, v := range k3d.DefaultObjectLabels {
labels[k] = v labels[k] = v
} }
for k, v := range k3d.DefaultObjectLabelsVar {
labels[k] = v
}
for k, v := range node.Labels { for k, v := range node.Labels {
labels[k] = v labels[k] = v
} }

3
pkg/client/registry.go
View File

@ -88,6 +88,9 @@ func RegistryCreate(ctx context.Context, runtime runtimes.Runtime, reg *k3d.Regi
for k, v := range k3d.DefaultObjectLabels { for k, v := range k3d.DefaultObjectLabels {
registryNode.Labels[k] = v registryNode.Labels[k] = v
} }
for k, v := range k3d.DefaultObjectLabelsVar {
registryNode.Labels[k] = v
}
// port // port
registryNode.Ports = nat.PortMap{} registryNode.Ports = nat.PortMap{}

3
pkg/runtimes/docker/volume.go
View File

@ -52,6 +52,9 @@ func (d Docker) CreateVolume(ctx context.Context, name string, labels map[string
for k, v := range k3d.DefaultObjectLabels { for k, v := range k3d.DefaultObjectLabels {
volumeCreateOptions.Labels[k] = v volumeCreateOptions.Labels[k] = v
} }
for k, v := range k3d.DefaultObjectLabelsVar {
volumeCreateOptions.Labels[k] = v
}
vol, err := docker.VolumeCreate(ctx, volumeCreateOptions) vol, err := docker.VolumeCreate(ctx, volumeCreateOptions)
if err != nil { if err != nil {

7
pkg/tools/tools.go
View File

@ -201,6 +201,13 @@ func ImageImportIntoClusterMulti(ctx context.Context, runtime runtimes.Runtime,
// startToolsNode will start a new k3d tools container and connect it to the network of the chosen cluster // startToolsNode will start a new k3d tools container and connect it to the network of the chosen cluster
func startToolsNode(ctx context.Context, runtime runtimes.Runtime, cluster *k3d.Cluster, network string, volumes []string) (*k3d.Node, error) { func startToolsNode(ctx context.Context, runtime runtimes.Runtime, cluster *k3d.Cluster, network string, volumes []string) (*k3d.Node, error) {
labels := map[string]string{}
for k, v := range k3d.DefaultObjectLabels {
labels[k] = v
}
for k, v := range k3d.DefaultObjectLabelsVar {
labels[k] = v
}
node := &k3d.Node{ node := &k3d.Node{
Name: fmt.Sprintf("%s-%s-tools", k3d.DefaultObjectNamePrefix, cluster.Name), Name: fmt.Sprintf("%s-%s-tools", k3d.DefaultObjectNamePrefix, cluster.Name),
Image: fmt.Sprintf("%s:%s", k3d.DefaultToolsImageRepo, version.GetHelperImageVersion()), Image: fmt.Sprintf("%s:%s", k3d.DefaultToolsImageRepo, version.GetHelperImageVersion()),

8
pkg/types/types.go
View File

@ -106,8 +106,12 @@ var ClusterExternalNodeRoles = []Role{
// DefaultObjectLabels specifies a set of labels that will be attached to k3d objects by default // DefaultObjectLabels specifies a set of labels that will be attached to k3d objects by default
var DefaultObjectLabels = map[string]string{ var DefaultObjectLabels = map[string]string{
"app": "k3d", "app": "k3d",
"k3d.version": version.Version, }
// DefaultObjectLabelsVar specifies a set of labels that will be attached to k3d objects by default but are not static (e.g. across k3d versions)
var DefaultObjectLabelsVar = map[string]string{
"k3d.version": version.GetVersion(),
} }
// List of k3d technical label name // List of k3d technical label name