CR-18810-fix-create-gs #695
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
noam-codefresh
requested review from
danielm-codefresh,
pasha-codefresh,
ziv-codefresh,
itai-codefresh and
daniel-codefresh
as code owners
noam-codefresh
commented
May 23, 2023
|
|
||
| "github.com/Masterminds/semver/v3" | ||
| "github.com/argoproj-labs/argocd-autopilot/pkg/kube" | ||
| apkube "github.com/argoproj-labs/argocd-autopilot/pkg/kube" |
There was a problem hiding this comment.
reorder and add alias
| @@ -38,8 +38,7 @@ import ( | |||
| "github.com/codefresh-io/cli-v2/pkg/util/kube" | |||
| routingutil "github.com/codefresh-io/cli-v2/pkg/util/routing" | |||
|
|
|||
| "github.com/argoproj-labs/argocd-autopilot/pkg/fs" | |||
| "github.com/argoproj-labs/argocd-autopilot/pkg/git" | |||
| apfs "github.com/argoproj-labs/argocd-autopilot/pkg/fs" | |||
There was a problem hiding this comment.
reorder and add alias
Comment on lines
-747
to
-763
| func isRuntimeManaged(ctx context.Context, runtimeName string) (bool, error) { | ||
| rt, err := getRuntime(ctx, runtimeName) | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
|
|
||
| return rt.Managed, nil | ||
| } | ||
|
|
||
| func getRuntimeInstallationType(ctx context.Context, runtimeName string) (*platmodel.InstallationType, error) { | ||
| rt, err := getRuntime(ctx, runtimeName) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &rt.InstallationType, nil | ||
| } |
There was a problem hiding this comment.
no need for those two funcs, were used in install prerun func before
Comment on lines
+33
to
+35
| apapp "github.com/argoproj-labs/argocd-autopilot/pkg/application" | ||
| apfs "github.com/argoproj-labs/argocd-autopilot/pkg/fs" | ||
| apgit "github.com/argoproj-labs/argocd-autopilot/pkg/git" |
There was a problem hiding this comment.
reorder and add alias
Comment on lines
+191
to
+199
| runtimeName := args[0] | ||
| runtime, err := getRuntime(ctx, runtimeName) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| runtimeNamespace := runtimeName | ||
| if runtime.Metadata.Namespace != nil { | ||
| runtimeNamespace = *runtime.Metadata.Namespace |
There was a problem hiding this comment.
fix for git-source create command
| return errors.New("This runtime was installed using Helm, please use Helm to uninstall it as well.") | ||
| } | ||
|
|
||
| if !opts.SkipChecks { |
There was a problem hiding this comment.
removed all usage of SkipChecks
| if !opts.Managed { | ||
| opts.kubeContext, err = getKubeContextName(cmd.Flag("context"), cmd.Flag("kubeconfig")) | ||
| if rt.Metadata.Namespace != nil { | ||
| opts.runtimeNamespace = *rt.Metadata.Namespace |
There was a problem hiding this comment.
get namespace from platform runtime object
Comment on lines
+49
to
+50
| apapp "github.com/argoproj-labs/argocd-autopilot/pkg/application" | ||
| apfs "github.com/argoproj-labs/argocd-autopilot/pkg/fs" |
There was a problem hiding this comment.
reorder and add alias
| @@ -2191,3 +2192,22 @@ func patchClusterResourcesAppSet(fs fs.FS) error { | |||
| appSet.ObjectMeta.Labels[store.Get().LabelKeyCFInternal] = "true" | |||
| return fs.WriteYamls(name, appSet) | |||
| } | |||
|
|
|||
| func getRuntimeNamespace(cmd *cobra.Command, runtimeName string, runtimeVersion *semver.Version) string { | |||
There was a problem hiding this comment.
moved from runtime.go to runtime_install.go - only used inside this file
| @@ -40,7 +40,6 @@ cli-v2 runtime uninstall [RUNTIME_NAME] [flags] | |||
| -n, --namespace string If present, the namespace scope for this CLI request | |||
| --repo string Repository URL [GIT_REPO] | |||
| --request-timeout string The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default "0") | |||
| --skip-checks If true, will not verify that runtime exists before uninstalling | |||
There was a problem hiding this comment.
marked as deprecated - so it doesn't appear in help text
danielm-codefresh
approved these changes
May 23, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
cf git-source createcommand to not crash (and handle runtime namespace correctly)cf runtime uninstallto get runtime namespace from platformWhy
the
cf git-source createcommand was crashing, thecf runtime uninstallwas working (even when runtimeName !== runtimeNamespace), but in a less safe way