Skip to content

Commit eb954dc

Browse files
cbleckerdhaiducek
authored andcommitted
Fix go install and module path
ref: https://issues.redhat.com/browse/ACM-2598 Co-authored-by: Dale Haiducek <[email protected]> Signed-off-by: Christoph Blecker <[email protected]> Signed-off-by: Dale Haiducek <[email protected]>
1 parent 7b2f2f5 commit eb954dc

File tree

16 files changed

+24
-24
lines changed

16 files changed

+24
-24
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*.so
66
*.dylib
77
**/.DS_Store
8-
PolicyGenerator
8+
/PolicyGenerator
99
build_output
1010

1111
# Test binary, built with `go test -c`

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ clean:
4848

4949
.PHONY: build
5050
build: layout
51-
go build -o $(API_PLUGIN_PATH)/PolicyGenerator cmd/main.go
51+
go build -o $(API_PLUGIN_PATH)/ ./cmd/PolicyGenerator
5252

5353
.PHONY: build-binary
5454
build-binary:
55-
go build -o PolicyGenerator cmd/main.go
55+
go build ./cmd/PolicyGenerator
5656

5757
.PHONY: build-release
5858
build-release:
@@ -62,9 +62,9 @@ build-release:
6262
exit 1; \
6363
fi
6464
@mkdir -p build_output
65-
GOOS=linux CGO_ENABLED=0 GOARCH=amd64 go build -o build_output/linux-amd64-PolicyGenerator cmd/main.go
66-
GOOS=darwin CGO_ENABLED=0 GOARCH=amd64 go build -o build_output/darwin-amd64-PolicyGenerator cmd/main.go
67-
GOOS=windows CGO_ENABLED=0 GOARCH=amd64 go build -o build_output/windows-amd64-PolicyGenerator.exe cmd/main.go
65+
GOOS=linux CGO_ENABLED=0 GOARCH=amd64 go build -o build_output/linux-amd64-PolicyGenerator ./cmd/PolicyGenerator
66+
GOOS=darwin CGO_ENABLED=0 GOARCH=amd64 go build -o build_output/darwin-amd64-PolicyGenerator ./cmd/PolicyGenerator
67+
GOOS=windows CGO_ENABLED=0 GOARCH=amd64 go build -o build_output/windows-amd64-PolicyGenerator.exe ./cmd/PolicyGenerator
6868

6969
.PHONY: generate
7070
generate:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ For more about Open Cluster Management and its Policy Framework:
1010

1111
- [Open Cluster Management website](https://open-cluster-management.io/)
1212
- [Governance Policy Framework](https://open-cluster-management.io/getting-started/integration/policy-framework/)
13-
- [Policy Collection repository](https://github.com/stolostron/policy-collection)
13+
- [Policy Collection repository](https://github.com/open-cluster-management-io/policy-collection)
1414

1515
## Using the Policy Generator
1616

build/common/config/.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ linters-settings:
7979
check-shadowing: false
8080
gci:
8181
sections:
82-
- prefix(open-cluster-management.io/ocm-kustomize-generator-plugins)
82+
- prefix(open-cluster-management.io/policy-generator-plugin)
8383
golint:
8484
# minimal confidence for issues, default is 0.8
8585
min-confidence: 0.0

cmd/main.go renamed to cmd/PolicyGenerator/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"os"
77

88
"github.com/spf13/pflag"
9-
"open-cluster-management.io/ocm-kustomize-generator-plugins/internal"
9+
"open-cluster-management.io/policy-generator-plugin/internal"
1010
)
1111

1212
var debug = false

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module open-cluster-management.io/ocm-kustomize-generator-plugins
1+
module open-cluster-management.io/policy-generator-plugin
22

33
go 1.18
44

internal/expanders/expanders.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package expanders
33

44
import (
5-
"open-cluster-management.io/ocm-kustomize-generator-plugins/internal/types"
5+
"open-cluster-management.io/policy-generator-plugin/internal/types"
66
)
77

88
// GetExpanders returns the list of available expanders.

internal/expanders/gatekeeper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66

77
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
8-
"open-cluster-management.io/ocm-kustomize-generator-plugins/internal/types"
8+
"open-cluster-management.io/policy-generator-plugin/internal/types"
99
)
1010

1111
type GatekeeperPolicyExpander struct{}

internal/expanders/gatekeeper_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"testing"
77

8-
"open-cluster-management.io/ocm-kustomize-generator-plugins/internal/types"
8+
"open-cluster-management.io/policy-generator-plugin/internal/types"
99
)
1010

1111
func TestGatekeeperCanHandle(t *testing.T) {

internal/expanders/kyverno.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66

77
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
8-
"open-cluster-management.io/ocm-kustomize-generator-plugins/internal/types"
8+
"open-cluster-management.io/policy-generator-plugin/internal/types"
99
)
1010

1111
type KyvernoPolicyExpander struct{}

0 commit comments

Comments
 (0)