Skip to content

Commit bf1d269

Browse files
CR 14460- Ingress-less allow list (#597)
1 parent 6deeeb6 commit bf1d269

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

Makefile

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

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

cmd/commands/common.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import (
3333
"github.com/codefresh-io/cli-v2/pkg/store"
3434
"github.com/codefresh-io/cli-v2/pkg/util"
3535

36-
platmodel "github.com/codefresh-io/go-sdk/pkg/codefresh/model"
3736
apgit "github.com/argoproj-labs/argocd-autopilot/pkg/git"
3837
aputil "github.com/argoproj-labs/argocd-autopilot/pkg/util"
38+
platmodel "github.com/codefresh-io/go-sdk/pkg/codefresh/model"
3939
"github.com/manifoldco/promptui"
4040
"github.com/spf13/cobra"
4141
"github.com/spf13/pflag"

cmd/commands/runtime_install.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ type (
109109
TunnelRegisterHost string
110110
TunnelDomain string
111111
TunnelSubdomain string
112+
IpsAllowList string
112113
SkipIngress bool
113114
BypassIngressClassCheck bool
114115

@@ -126,6 +127,7 @@ type (
126127

127128
tunnel struct {
128129
SubdomainPrefix string `json:"subdomainPrefix"`
130+
IpsAllowList string `json:"ipsAllowList"`
129131
}
130132

131133
ctcValues struct {
@@ -255,6 +257,7 @@ func NewRuntimeInstallCommand() *cobra.Command {
255257
cmd.Flags().StringVar(&accessMode, "access-mode", string(platmodel.AccessModeIngress), "The access mode to the cluster, one of: ingress|tunnel")
256258
cmd.Flags().StringVar(&installationOpts.TunnelRegisterHost, "tunnel-register-host", "register-tunnels.cf-cd.com", "The host name for registering a new tunnel")
257259
cmd.Flags().StringVar(&installationOpts.TunnelDomain, "tunnel-domain", "tunnels.cf-cd.com", "The base domain for the tunnels")
260+
cmd.Flags().StringVar(&installationOpts.IpsAllowList, "ips-allow-list", "", "lists the rules to configure which IP addresses (IPv4/IPv6) and subnet masks can access your client (e.g \"192.168.0.0/16, FE80:CD00:0000:0CDE:1257::/64\")")
258261

259262
installationOpts.InsCloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{
260263
CreateIfNotExist: true,
@@ -274,6 +277,7 @@ func NewRuntimeInstallCommand() *cobra.Command {
274277
util.Die(cmd.Flags().MarkHidden("access-mode"))
275278
util.Die(cmd.Flags().MarkHidden("tunnel-register-host"))
276279
util.Die(cmd.Flags().MarkHidden("tunnel-domain"))
280+
util.Die(cmd.Flags().MarkHidden("ips-allow-list"))
277281

278282
return cmd
279283
}
@@ -2034,6 +2038,7 @@ func (opts *RuntimeInstallOptions) GetValues(name string) (string, error) {
20342038
},
20352039
Tunnel: tunnel{
20362040
SubdomainPrefix: opts.TunnelSubdomain,
2041+
IpsAllowList: opts.IpsAllowList,
20372042
},
20382043
}
20392044
data, err := yaml.Marshal(values)

manifests/runtime.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
namespace: "{{ namespace }}"
66
spec:
77
defVersion: 2.0.0
8-
version: 0.0.536
8+
version: 0.0.537
99
bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
1010
components:
1111
- name: events
@@ -27,5 +27,5 @@ spec:
2727
url: github.com/codefresh-io/cli-v2/manifests/sealed-secrets
2828
- name: codefresh-tunnel-client
2929
type: helm
30-
url: github.com/codefresh-io/codefresh-tunnel-charts/codefresh-tunnel-client?ref=0.1.3
30+
url: github.com/codefresh-io/codefresh-tunnel-charts/codefresh-tunnel-client?ref=0.1.7
3131
feature: ingressless

0 commit comments

Comments
 (0)