Skip to content

Commit

Permalink
fix: a build typo in doc
Browse files Browse the repository at this point in the history
  • Loading branch information
yuwenma committed May 5, 2023
1 parent dd60946 commit 788ac08
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions dev/test
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ popd
# default, test direct kubectl applier
CGO_ENABLED=0 go test -count=1 -v ./...
# test applyset applier, without kubectl direct and exec dependencies
CGO_ENABLED=0 go test -tags without_exec_applier,without_direct_applier -count=1 -v ./...
CGO_ENABLED=0 go test -tags without-exec-applier,without-direct-applier -count=1 -v ./...
# test exec kubectl applier, without direct_applier dependencies
CGO_ENABLED=0 go test -tags without_direct_applier -count=1 -v ./...
CGO_ENABLED=0 go test -tags without-direct-applier -count=1 -v ./...

pushd examples/guestbook-operator
CGO_ENABLED=0 go test -count=1 -v ./...
Expand Down
2 changes: 1 addition & 1 deletion pkg/patterns/declarative/kustomize/enabled.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
)

// Run calls the kustomize/api library to run `kustomize build`. This method is differentiated by go build
// tag `without-kustomize`
// tag `without_kustomize`
func Run(ctx context.Context, fs filesys.FileSystem, manifestPath string) ([]byte, error) {
log := log.FromContext(ctx)
log.WithValues("manifestPath", manifestPath).Info("running kustomize")
Expand Down
4 changes: 2 additions & 2 deletions pkg/patterns/declarative/pkg/applier/direct.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build !without_exec_applier || !without_direct_applier
// +build !without_exec_applier !without_direct_applier
//go:build !without-exec-applier || !without-direct-applier
// +build !without-exec-applier !without-direct-applier

package applier

Expand Down
4 changes: 2 additions & 2 deletions pkg/patterns/declarative/pkg/applier/direct_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build !without_exec_applier || !without_direct_applier
// +build !without_exec_applier !without_direct_applier
//go:build !without-exec-applier || !without-direct-applier
// +build !without-exec-applier !without-direct-applier

/*
Copyright 2022 The Kubernetes Authors.
Expand Down
4 changes: 2 additions & 2 deletions pkg/patterns/declarative/pkg/applier/exec.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build !without_exec_applier
// +build !without_exec_applier
//go:build !without-exec-applier
// +build !without-exec-applier

/*
Copyright 2018 The Kubernetes Authors.
Expand Down
4 changes: 2 additions & 2 deletions pkg/patterns/declarative/pkg/applier/exec_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build !without_exec_applier
// +build !without_exec_applier
//go:build !without-exec-applier
// +build !without-exec-applier

/*
Copyright 2019 The Kubernetes Authors.
Expand Down
4 changes: 2 additions & 2 deletions pkg/patterns/declarative/pkg/applier/global.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build !without_exec_applier || !without_direct_applier
// +build !without_exec_applier !without_direct_applier
//go:build !without-exec-applier || !without-direct-applier
// +build !without-exec-applier !without-direct-applier

package applier

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build without_exec_applier && without_direct_applier
// +build without_exec_applier,without_direct_applier
//go:build without-exec-applier && without-direct-applier
// +build without-exec-applier,without-direct-applier

package applier

Expand Down
4 changes: 2 additions & 2 deletions pkg/test/testreconciler/simpletest/with_kubectl_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build !without_exec_applier || !without_direct_applier
// +build !without_exec_applier !without_direct_applier
//go:build !without-exec-applier || !without-direct-applier
// +build !without-exec-applier !without-direct-applier

package simpletest

Expand Down
2 changes: 1 addition & 1 deletion reconciler-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ instead of matching the namespace of the DeclarativeObject
## WithApplyKustomize
WithApplyKustomize runs the kustomize build to create final manifest. This feature needs the go dependency `kustomize/api`.
If you do not need kustomize or want to use a conflict version of `kustomize/api`, you can opt out the kustomize and
the `kustomize/api` dependency via go build tag `without-kustomize`. e.g. `go run ./main.go -tags without-kustomize`
the `kustomize/api` dependency via go build tag `without_kustomize`. e.g. `go run ./main.go -tags without_kustomize`

## WithManagedApplication
WithManagedApplication is a transform that will modify the Application object in the deployment to match the configuration of the rest of the deployment.
Expand Down

0 comments on commit 788ac08

Please sign in to comment.