Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,19 @@ bin/kind: curl-installed bin

deps: bin bin/jq bin/golangci-lint bin/gofumpt bin/kind

go-deps/update: go-installed
if [ -z "$(DEP)" ] ; then \
echo "Please pass dependency name over DEP like make go-deps/update DEP=github.com/some/lib VER=v1.1.1"; \
exit 1; \
fi; \
if [ -z "$(VER)" ] ; then \
echo "Please pass dependency version over VER like make go-deps/update DEP=github.com/some/lib VER=v1.1.1"; \
exit 1; \
fi; \
go get "$(DEP)@$(VER)"; \
cd ./tests; \
go get "$(DEP)@$(VER)"

test: go-installed docker-installed bin/kind
./hack/run_tests.sh
$(MAKE) clean/test
Expand Down
35 changes: 25 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,42 +15,57 @@ require (
github.com/spf13/pflag v1.0.10
github.com/stretchr/testify v1.11.1
golang.org/x/term v0.39.0
k8s.io/client-go v0.32.10
sigs.k8s.io/yaml v1.6.0
)

require (
github.com/DataDog/gostackparse v0.7.0 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
github.com/avelino/slugify v0.0.0-20180501145920-855f152bd774 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/deckhouse/deckhouse/pkg/log v0.1.1-0.20251230144142-2bad7c3d1edf // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-openapi/analysis v0.19.10 // indirect
github.com/go-openapi/errors v0.19.7 // indirect
github.com/go-openapi/jsonpointer v0.19.3 // indirect
github.com/go-openapi/jsonreference v0.19.3 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/loads v0.19.5 // indirect
github.com/go-openapi/runtime v0.19.16 // indirect
github.com/go-openapi/strfmt v0.19.5 // indirect
github.com/go-openapi/swag v0.19.9 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-openapi/validate v0.19.12 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/gookit/color v1.5.2 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/mailru/easyjson v0.7.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mitchellh/mapstructure v1.3.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/rogpeppe/go-internal v1.14.1 // indirect
github.com/werf/logboek v0.5.5 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
go.mongodb.org/mongo-driver v1.5.1 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
golang.org/x/crypto v0.47.0 // indirect
golang.org/x/net v0.48.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sys v0.40.0 // indirect
golang.org/x/text v0.33.0 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
golang.org/x/time v0.7.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apimachinery v0.32.10 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
)
110 changes: 97 additions & 13 deletions go.sum

Large diffs are not rendered by default.

14 changes: 12 additions & 2 deletions pkg/init.go → pkg/kube/config.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2025 Flant JSC
// Copyright 2026 Flant JSC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -12,4 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package pkg
package kube

import "k8s.io/client-go/rest"

type Config struct {
KubeConfig string
KubeConfigContext string
KubeConfigInCluster bool

RestConfig *rest.Config
}
247 changes: 247 additions & 0 deletions pkg/kube/parse_flags.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,247 @@
// Copyright 2026 Flant JSC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package kube

import (
"fmt"

"github.com/deckhouse/lib-dhctl/pkg/log"
"github.com/name212/govalue"
flag "github.com/spf13/pflag"
"k8s.io/client-go/tools/clientcmd"

"github.com/deckhouse/lib-connection/pkg/settings"
"github.com/deckhouse/lib-connection/pkg/utils/env"
"github.com/deckhouse/lib-connection/pkg/utils/file"
baseflags "github.com/deckhouse/lib-connection/pkg/utils/flags"
)

const (
ConfigEnv = "KUBE_CONFIG"
ConfigContextEnv = "KUBE_CONFIG_CONTEXT"
ClientFromClusterEnv = "KUBE_CLIENT_FROM_CLUSTER"
)

const (
kubeConfigFlag = "kubeconfig"
kubeConfigContextFlag = "kubeconfig-context"
clientFromClusterFlag = "kube-client-from-cluster"
)

type Flags struct {
Config

baseFlags *baseflags.BaseFlags
}

// Parse
// pass nil if we should use os.Args
func (f *Flags) Parse(args []string) error {
// Parse check that flags is initialized
return f.baseFlags.Parse(args)
}

func (f *Flags) IsConflictBetweenFlags() error {
if f.KubeConfig != "" && f.KubeConfigInCluster {
envsExtractor, err := f.baseFlags.ShouldEnvExtractor()
if err != nil {
return err
}

return fmt.Errorf(
"Cannot use both --%s and --%s or envs %s and %s at the same time",
kubeConfigFlag,
clientFromClusterFlag,
envsExtractor.NameWithPrefix(ConfigEnv),
envsExtractor.NameWithPrefix(ClientFromClusterEnv),
)
}

return nil
}

func (f *Flags) RewriteFromEnvs() error {
envExtractor, err := f.baseFlags.ShouldEnvExtractor()
if err != nil {
return err
}

err = envExtractor.ExtractAllVars(
env.NewVar(ConfigEnv, &f.KubeConfig),
env.NewVar(ConfigContextEnv, &f.KubeConfigContext),
env.NewVar(ClientFromClusterEnv, &f.KubeConfigInCluster),
)

if err != nil {
return err
}

if f.KubeConfig != "" || f.KubeConfigInCluster {
return nil
}

envExtractor.StringWithoutPrefix("KUBECONFIG", &f.KubeConfig)

return nil
}

type FlagsParser struct {
*baseflags.BaseParser
}

// NewFlagsParser
// init FlagsParser
// prefix will trim right all _ ang - symbols and spaces left and right from settings.Settings EnvsPrefix
// By default parser add _ after prefix for all env vars
func NewFlagsParser(sett settings.Settings) *FlagsParser {
return &FlagsParser{
BaseParser: baseflags.NewBaseParser(sett),
}
}

// InitFlags
// init flag.FlagSet and return struct with flags where flag.FlagSet parsed
// Flags contains copy of set. For parse use Flags.Parse
// if set is parsed returns error
func (p *FlagsParser) InitFlags(set *flag.FlagSet) (*Flags, error) {
if set.Parsed() {
return nil, fmt.Errorf("Flags already parsed")
}

envsExtractor := p.NewEnvsExtractor()

flags := &Flags{
baseFlags: baseflags.NewBaseFlags(set, envsExtractor, baseflags.BaseFlagsSkipUnknownFlags()),
}

set = flags.baseFlags.FlagSet()

set.StringVar(
&flags.KubeConfig,
kubeConfigFlag,
"",
envsExtractor.AddEnvToUsage(
"Path to kubernetes config file.",
ConfigContextEnv,
),
)

set.StringVar(
&flags.KubeConfigContext,
kubeConfigContextFlag,
"",
envsExtractor.AddEnvToUsage(
"Context from kubernetes config to connect to Kubernetes API.",
ConfigContextEnv,
),
)

set.BoolVar(
&flags.KubeConfigInCluster,
clientFromClusterFlag,
false,
envsExtractor.AddEnvToUsage(
"Use in-cluster Kubernetes API access.",
ClientFromClusterEnv,
),
)

return flags, nil
}

// ExtractConfigAfterParse
// extract ConnectionConfig from flags
// should call after InitFlags and flag.Parse or flag.FlagSet.Parse
// if flag.FlagSet in Flags is not parse returns error
func (p *FlagsParser) ExtractConfigAfterParse(flags *Flags) (*Config, error) {
if err := flags.baseFlags.IsInitialized(); err != nil {
return nil, err
}

if err := flags.RewriteFromEnvs(); err != nil {
return nil, err
}

if err := flags.IsConflictBetweenFlags(); err != nil {
return nil, err
}

sett := p.Settings()
logger := sett.Logger()

if err := p.validateKubeConfigWithContext(flags, logger); err != nil {
return nil, err
}

return &Config{
KubeConfig: flags.KubeConfig,
KubeConfigContext: flags.KubeConfigContext,
KubeConfigInCluster: flags.KubeConfigInCluster,
}, nil
}

// ParseFlagsAndExtractConfig
// initialize, parse and extract ConnectionConfig from flags
// set flag.FlagSet can be nil. If nil, func initialize new flag.FlagSet
// if arguments is nil extract arguments from os.Args
func (p *FlagsParser) ParseFlagsAndExtractConfig(arguments []string, set *flag.FlagSet) (*Config, error) {
if govalue.Nil(set) {
set = flag.NewFlagSet("kube", flag.ExitOnError)
}

flags, err := p.InitFlags(set)
if err != nil {
return nil, err
}

// nil arguments will rewrite from os.Args
if err := flags.Parse(arguments); err != nil {
return nil, err
}

return p.ExtractConfigAfterParse(flags)
}

func (p *FlagsParser) validateKubeConfigWithContext(flags *Flags, logger log.Logger) error {
kubeConfigFile := flags.KubeConfig
context := flags.KubeConfigContext

if kubeConfigFile == "" {
if context != "" {
return fmt.Errorf("Pass context flag --%s without kubeconfig path --%s ", kubeConfigContextFlag, kubeConfigFlag)
}

return nil
}

content, err := file.ReadFile(kubeConfigFile, "kube config", logger)
if err != nil {
return err
}

cfg, err := clientcmd.Load(content)
if err != nil {
return fmt.Errorf("Cannot parse kube config file '%s': %w", kubeConfigFile, err)
}

if context != "" {
_, ok := cfg.Contexts[context]
if !ok {
return fmt.Errorf("Cannot find context '%s' in kube config %s", context, kubeConfigFile)
}
}

return nil
}
Loading