Skip to content

Commit f17b72a

Browse files
authored
CR-15095-remove-flag (#612)
* removed old flag * updated version to 0.0.550 * updated codeowners
1 parent 4e44b64 commit f17b72a

File tree

5 files changed

+8
-15
lines changed

5 files changed

+8
-15
lines changed

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* roi.kramer@codefresh.io noam.gal@codefresh.io oren.gurfinkel@codefresh.io pavel@codefresh.io ziv@codefresh.io itai@codefresh.io
1+
* roi.kramer@codefresh.io noam.gal@codefresh.io daniel.maizel@codefresh.io pavel@codefresh.io ziv@codefresh.io itai@codefresh.io

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=v0.0.553
1+
VERSION=v0.0.554
22

33
OUT_DIR=dist
44
YEAR?=$(shell date +"%Y")

cmd/commands/runtime_install.go

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,10 @@ import (
2020
"encoding/hex"
2121
"errors"
2222
"fmt"
23-
billyUtils "github.com/go-git/go-billy/v5/util"
2423
"io"
25-
appsv1 "k8s.io/api/apps/v1"
2624
"net"
2725
"net/url"
2826
"os"
29-
kustid "sigs.k8s.io/kustomize/kyaml/resid"
3027
"strconv"
3128
"strings"
3229
"sync"
@@ -62,16 +59,19 @@ import (
6259
apmodel "github.com/codefresh-io/go-sdk/pkg/codefresh/model/app-proxy"
6360
"github.com/ghodss/yaml"
6461
"github.com/go-git/go-billy/v5/memfs"
62+
billyUtils "github.com/go-git/go-billy/v5/util"
6563
"github.com/manifoldco/promptui"
6664
"github.com/rkrmr33/checklist"
6765
"github.com/spf13/cobra"
6866
"golang.org/x/text/cases"
6967
"golang.org/x/text/language"
68+
appsv1 "k8s.io/api/apps/v1"
7069
v1 "k8s.io/api/core/v1"
7170
rbacv1 "k8s.io/api/rbac/v1"
7271
kerrors "k8s.io/apimachinery/pkg/api/errors"
7372
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
7473
kusttypes "sigs.k8s.io/kustomize/api/types"
74+
kustid "sigs.k8s.io/kustomize/kyaml/resid"
7575
)
7676

7777
type (
@@ -103,7 +103,6 @@ type (
103103
SuggestedSharedConfigRepo string
104104
InternalIngressAnnotation map[string]string
105105
ExternalIngressAnnotation map[string]string
106-
EnableGitProviders bool
107106
AccessMode platmodel.AccessMode
108107
TunnelRegisterHost string
109108
TunnelDomain string
@@ -269,7 +268,6 @@ func NewRuntimeInstallCommand() *cobra.Command {
269268
cmd.Flags().StringToStringVar(&installationOpts.NamespaceLabels, "namespace-labels", nil, "Optional labels that will be set on the namespace resource. (e.g. \"key1=value1,key2=value2\"")
270269
cmd.Flags().StringToStringVar(&installationOpts.InternalIngressAnnotation, "internal-ingress-annotation", nil, "Add annotations to the internal ingress")
271270
cmd.Flags().StringToStringVar(&installationOpts.ExternalIngressAnnotation, "external-ingress-annotation", nil, "Add annotations to the external ingress")
272-
cmd.Flags().BoolVar(&installationOpts.EnableGitProviders, "enable-git-providers", false, "Enable git providers (bitbucket|bitbucket-server|gitlab)")
273271
cmd.Flags().StringVar(&installationOpts.runtimeDef, "runtime-def", store.RuntimeDefURL, "Install runtime from a specific manifest")
274272
cmd.Flags().StringVar(&accessMode, "access-mode", string(platmodel.AccessModeIngress), "The access mode to the cluster, one of: ingress|tunnel")
275273
cmd.Flags().StringVar(&installationOpts.TunnelRegisterHost, "tunnel-register-host", "register-tunnels.cf-cd.com", "The host name for registering a new tunnel")
@@ -290,7 +288,6 @@ func NewRuntimeInstallCommand() *cobra.Command {
290288
installationOpts.kubeconfig = cmd.Flag("kubeconfig").Value.String()
291289

292290
util.Die(cmd.Flags().MarkHidden("bypass-ingress-class-check"))
293-
util.Die(cmd.Flags().MarkHidden("enable-git-providers"))
294291
util.Die(cmd.Flags().MarkHidden("access-mode"))
295292
util.Die(cmd.Flags().MarkHidden("tunnel-register-host"))
296293
util.Die(cmd.Flags().MarkHidden("tunnel-domain"))
@@ -407,10 +404,6 @@ func ensureGitData(cmd *cobra.Command, opts *RuntimeInstallOptions) error {
407404
return err
408405
}
409406

410-
if opts.gitProvider.Type() != cfgit.GITHUB && !opts.EnableGitProviders {
411-
return fmt.Errorf("Unsupported git provider type %s", opts.gitProvider.Type())
412-
}
413-
414407
opts.InsCloneOpts.Provider = string(opts.gitProvider.Type())
415408
err = getGitToken(cmd, opts)
416409
handleCliStep(reporter.InstallStepPreCheckEnsureGitToken, "Getting git token", err, true, false)

docs/releases/release_notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ cf version
2323

2424
```bash
2525
# download and extract the binary
26-
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.553/cf-linux-amd64.tar.gz | tar zx
26+
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.554/cf-linux-amd64.tar.gz | tar zx
2727

2828
# move the binary to your $PATH
2929
mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
3636

3737
```bash
3838
# download and extract the binary
39-
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.553/cf-darwin-amd64.tar.gz | tar zx
39+
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.554/cf-darwin-amd64.tar.gz | tar zx
4040

4141
# move the binary to your $PATH
4242
mv ./cf-darwin-amd64 /usr/local/bin/cf

manifests/runtime.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
namespace: "{{ namespace }}"
66
spec:
77
defVersion: 2.1.1
8-
version: 0.0.553
8+
version: 0.0.554
99
bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
1010
components:
1111
- name: events

0 commit comments

Comments
 (0)