Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

connectivity: Add --assume-cilium-version flag #982

Merged
merged 1 commit into from
Jul 20, 2022
Merged

connectivity: Add --assume-cilium-version flag #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions connectivity/check/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
)

type Parameters struct {
AssumeCiliumVersion string
CiliumNamespace string
TestNamespace string
SingleNode bool
Expand Down
10 changes: 8 additions & 2 deletions connectivity/suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,14 @@ func Run(ctx context.Context, ct *check.ConnectivityTest) error {
}

var v semver.Version
helmState, err := ct.K8sClient().GetHelmState(ctx, ct.Params().CiliumNamespace, defaults.HelmValuesSecretName)
if err != nil {
if assumeCiliumVersion := ct.Params().AssumeCiliumVersion; assumeCiliumVersion != "" {
ct.Warnf("Assuming Cilium version %s for connectivity tests", assumeCiliumVersion)
var err error
v, err = utils.ParseCiliumVersion(assumeCiliumVersion)
if err != nil {
return err
}
} else if helmState, err := ct.K8sClient().GetHelmState(ctx, ct.Params().CiliumNamespace, defaults.HelmValuesSecretName); err != nil {
ct.Warnf("Unable to detect Cilium version, assuming %v for connectivity tests", defaults.Version)
v, err = utils.ParseCiliumVersion(defaults.Version)
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions internal/cli/cmd/connectivity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ func newCmdConnectivityTest() *cobra.Command {
cmd.Flags().StringSliceVar(&tests, "test", []string{}, "Run tests that match one of the given regular expressions, skip tests by starting the expression with '!', target Scenarios with e.g. '/pod-to-cidr'")
cmd.Flags().StringVar(&params.FlowValidation, "flow-validation", check.FlowValidationModeWarning, "Enable Hubble flow validation { disabled | warning | strict }")
cmd.Flags().BoolVar(&params.AllFlows, "all-flows", false, "Print all flows during flow validation")
cmd.Flags().StringVar(&params.AssumeCiliumVersion, "assume-cilium-version", "", "Assume Cilium version for connectivity tests")
cmd.Flags().BoolVarP(&params.Verbose, "verbose", "v", false, "Show informational messages and don't buffer any lines")
cmd.Flags().BoolVarP(&params.Debug, "debug", "d", false, "Show debug messages")
cmd.Flags().BoolVarP(&params.PauseOnFail, "pause-on-fail", "p", false, "Pause execution on test failure")
Expand Down