Skip to content

Commit

Permalink
Adding namespace to install
Browse files Browse the repository at this point in the history
  • Loading branch information
luizbafilho committed Dec 1, 2020
1 parent c5d060b commit 919511b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ deploy: manifests
kustomize build config/default | kubectl apply -f -

# Generate manifests e.g. CRD, RBAC etc.
manifests: controller-gen pkger
manifests: controller-gen
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
pkger -o lokustctl

# Run go fmt against code
fmt:
Expand All @@ -63,9 +62,6 @@ docker-build: test
docker-push:
docker push ${IMG}

pkger:
go get github.com/markbates/pkger/cmd/pkger

# find or download controller-gen
# download controller-gen if necessary
controller-gen:
Expand Down
3 changes: 2 additions & 1 deletion lokustctl/cmd/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func runSetNamepaceAndNameprefix() error {
return err
}
m.NamePrefix = kustomizeNamePrefix
m.Namespace = config.Namespace
m.Namespace = kustomizeNamespace
return mf.Write(m)
}

Expand Down Expand Up @@ -183,4 +183,5 @@ func init() {
rootCmd.AddCommand(installCmd)

installCmd.Flags().StringVar(&kustomizeNamePrefix, "name-prefix", "lokust-", "kubernetes resources name prefix override (default lokust-)")
installCmd.Flags().StringVar(&kustomizeNamespace, "namespace", "lokust-system", "kubernetes name to install the operator (default lokust-system)")
}
Loading

0 comments on commit 919511b

Please # to comment.