Skip to content

Commit

Permalink
updated install file
Browse files Browse the repository at this point in the history
  • Loading branch information
@henderiw
henderiw committed May 26, 2024
1 parent bb74bde commit 6567f16
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 21 deletions.
4 changes: 2 additions & 2 deletions commands/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import (
"github.com/kubenet-dev/kubenetctl/commands/destroycmd"
"github.com/kubenet-dev/kubenetctl/commands/installcmd"
"github.com/kubenet-dev/kubenetctl/commands/invcmd"
"github.com/kubenet-dev/kubenetctl/commands/networkbridgedcmd"
"github.com/kubenet-dev/kubenetctl/commands/networkconfigcmd"
"github.com/kubenet-dev/kubenetctl/commands/networkdefaultcmd"
"github.com/kubenet-dev/kubenetctl/commands/networkbridgedcmd"
"github.com/kubenet-dev/kubenetctl/commands/networkroutedcmd"
"github.com/kubenet-dev/kubenetctl/commands/networkirbcmd"
"github.com/kubenet-dev/kubenetctl/commands/networkroutedcmd"
"github.com/kubenet-dev/kubenetctl/commands/sdccmd"
"github.com/kubenet-dev/kubenetctl/commands/setupcmd"
"github.com/kubenet-dev/kubenetctl/pkg/run"
Expand Down
2 changes: 1 addition & 1 deletion commands/destroycmd/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ func (r *Runner) runE(c *cobra.Command, args []string) error {
run.S("Destroy Containerlab topology"),
run.S("sudo containerlab destroy -t https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/lab/3node.yaml"),
)

return x.Run(ctx)
}
4 changes: 1 addition & 3 deletions commands/installcmd/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func (r *Runner) runE(c *cobra.Command, args []string) error {

x.Step(
run.S("install package server: (tool to interact with git from k8s using packages (KRM manifests))"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/artifacts/out/pkgserver.yaml"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/artifacts/out/pkgserver.yaml"),
)

x.Step(
Expand All @@ -80,13 +80,11 @@ func (r *Runner) runE(c *cobra.Command, args []string) error {
x.Step(
run.S("install kuid-apps: (apps leveraging kuid-server focussed on networking"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/artifacts/out/kuidapps.yaml"),

)

x.Step(
run.S("install kuid-nokia-srl: (vendor specific app for specific nokia srl artifacts "),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/artifacts/out/kuid-nokia-srl.yaml"),

)

return x.Run(ctx)
Expand Down
4 changes: 2 additions & 2 deletions commands/invcmd/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ func (r *Runner) runE(c *cobra.Command, args []string) error {

x.Step(
run.S("apply the nodemodel configuration for ixrd2 srlinux device"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/inventory/srl/ixrd2.yaml"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/inventory/srl/ixrd2.yaml"),
)

x.Step(
run.S("apply the nodemodel configuration for ixrd3 srlinux device"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/inventory/srl/ixrd3.yaml"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/inventory/srl/ixrd3.yaml"),
)

x.Step(
Expand Down
2 changes: 1 addition & 1 deletion commands/networkbridgedcmd/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func (r *Runner) runE(c *cobra.Command, args []string) error {

x.Step(
run.S("apply the default network config"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/network/vpc1-bridged-network.yaml"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/network/vpc1-bridged-network.yaml"),
)

return x.Run(ctx)
Expand Down
4 changes: 2 additions & 2 deletions commands/networkconfigcmd/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ func (r *Runner) runE(c *cobra.Command, args []string) error {

x.Step(
run.S("apply the ip index (network prefixes the network is setup with)"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/network/default-ipindex.yaml"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/network/default-ipindex.yaml"),
)

x.Step(
run.S("apply the network config (network parameters for your network, BGP, VXLAN, Prefixes)"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/network/default-networkconfig.yaml"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/network/default-networkconfig.yaml"),
)

return x.Run(ctx)
Expand Down
2 changes: 1 addition & 1 deletion commands/networkdefaultcmd/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func (r *Runner) runE(c *cobra.Command, args []string) error {

x.Step(
run.S("apply the default network config"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/network/default-network.yaml"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/network/default-network.yaml"),
)

return x.Run(ctx)
Expand Down
2 changes: 1 addition & 1 deletion commands/networkirbcmd/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func (r *Runner) runE(c *cobra.Command, args []string) error {

x.Step(
run.S("apply the default network config"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/network/vpc3-irb-network.yaml"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/network/vpc3-irb-network.yaml"),
)

return x.Run(ctx)
Expand Down
2 changes: 1 addition & 1 deletion commands/networkroutedcmd/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func (r *Runner) runE(c *cobra.Command, args []string) error {

x.Step(
run.S("apply the default network config"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/network/vpc2-routed-network.yaml"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/network/vpc2-routed-network.yaml"),
)

return x.Run(ctx)
Expand Down
2 changes: 1 addition & 1 deletion commands/sdccmd/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func (r *Runner) runE(c *cobra.Command, args []string) error {

x.Step(
run.S("apply the schema for srlinux 24.3.2"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/sdc/schemas/srl24-3-2.yaml"),
run.S("kubectl apply -f https://raw.githubusercontent.com/kubenet-dev/kubenet/v0.0.1/sdc/schemas/srl24-3-2.yaml"),
)

x.Step(
Expand Down
2 changes: 0 additions & 2 deletions commands/setupcmd/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,3 @@ func (r *Runner) runE(c *cobra.Command, args []string) error {

return x.Run(ctx)
}


6 changes: 3 additions & 3 deletions install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
# The install script is based off of the Apache 2.0 script from Helm,
# https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3

: ${BINARY_NAME:="kubenet"}
: ${PROJECT_NAME:="kubenet"} # if project name does not match binary name
: ${BINARY_NAME:="kubenetctl"}
: ${PROJECT_NAME:="kubenetctl"} # if project name does not match binary name
: ${USE_SUDO:="true"}
: ${USE_PKG:="false"} # default --use-pkg flag value. will use package installation by default unless the default is changed to false
: ${VERIFY_CHECKSUM:="false"}
: ${BIN_INSTALL_DIR:="/usr/local/bin"}
: ${REPO_NAME:="kubenet-dev/kubenetctl"}
: ${REPO_URL:="https://github.com/$REPO_NAME"}
: ${PROJECT_URL:="https://kubenet.kubenet-dev.dev"}
: ${PROJECT_URL:="https://learn.kubenet.dev"}
: ${LATEST_URL:="https://api.github.com/repos/$REPO_NAME/releases/latest"}
# detectArch discovers the architecture for this system.
detectArch() {
Expand Down
2 changes: 1 addition & 1 deletion makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ vet: ## Run go vet against code.

.PHONY: all
all: fmt vet ## Build manager binary.
go build -ldflags "-X github.com/kubenet-dev/kubenetctl/commands/commands.version=${GIT_COMMIT}" -o $(LOCALBIN)/kubenet -v main.go
go build -ldflags "-X github.com/kubenet-dev/kubenetctl/commands/commands.version=${GIT_COMMIT}" -o $(LOCALBIN)/kubenetctl -v main.go

##@ Build Dependencies

Expand Down

0 comments on commit 6567f16

Please sign in to comment.