Skip to content

Commit

Permalink
update policyreport group to wgpolicyk8s.io
Browse files Browse the repository at this point in the history
  • Loading branch information
realshuting committed Nov 11, 2020
1 parent 0d96345 commit 2292bf8
Show file tree
Hide file tree
Showing 36 changed files with 7,059 additions and 6,977 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,9 @@ release:
kustomize build ./definitions > ./definitions/release/install.yaml

report-crd: controller-gen
$(CONTROLLER_GEN) crd:trivialVersions=true paths="./pkg/api/policyreport/v1alpha1" output:dir=./definitions/crds
$(CONTROLLER_GEN) crd:trivialVersions=true paths=./pkg/api/policyreport/v1alpha1 output:dir=./definitions/crds
$(CONTROLLER_GEN) object paths=./pkg/api/policyreport/v1alpha1
$(CONTROLLER_GEN) crd:trivialVersions=true paths="./pkg/api/kyverno/v1alpha1" output:dir=./definitions/crds
$(CONTROLLER_GEN) crd:trivialVersions=true paths=./pkg/api/kyverno/v1alpha1 output:dir=./definitions/crds
$(CONTROLLER_GEN) object paths=./pkg/api/kyverno/v1alpha1

# find or download controller-gen
Expand All @@ -198,7 +198,7 @@ ifeq (, $(shell which controller-gen))
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
cd $$CONTROLLER_GEN_TMP_DIR ;\
go mod init tmp ;\
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.5 ;\
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.0 ;\
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
}
CONTROLLER_GEN=$(GOBIN)/controller-gen
Expand Down
2,810 changes: 1,409 additions & 1,401 deletions charts/kyverno/crds/crds.yaml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions cmd/kyverno/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@ func main() {
)

prgen = policyreport.NewReportGenerator(client,
pInformer.Policy().V1alpha1().ClusterPolicyReports(),
pInformer.Policy().V1alpha1().PolicyReports(),
pInformer.Wgpolicyk8s().V1alpha1().ClusterPolicyReports(),
pInformer.Wgpolicyk8s().V1alpha1().PolicyReports(),
pInformer.Kyverno().V1alpha1().ReportChangeRequests(),
pInformer.Kyverno().V1alpha1().ClusterReportChangeRequests(),
kubeInformer.Core().V1().Namespaces(),
Expand Down
4 changes: 2 additions & 2 deletions definitions/crds/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Kustomization

resources:
- ./crds.yaml
- ./policy.k8s.io_clusterpolicyreports.yaml
- ./policy.k8s.io_policyreports.yaml
- ./wgpolicyk8s.io_clusterpolicyreports.yaml
- ./wgpolicyk8s.io_policyreports.yaml
- ./kyverno.io_reportchangerequests.yaml
- ./kyverno.io_clusterreportchangerequests.yaml
602 changes: 302 additions & 300 deletions definitions/crds/kyverno.io_clusterreportchangerequests.yaml

Large diffs are not rendered by default.

602 changes: 302 additions & 300 deletions definitions/crds/kyverno.io_reportchangerequests.yaml

Large diffs are not rendered by default.

336 changes: 0 additions & 336 deletions definitions/crds/policy.k8s.io_clusterpolicyreports.yaml

This file was deleted.

335 changes: 0 additions & 335 deletions definitions/crds/policy.k8s.io_policyreports.yaml

This file was deleted.

338 changes: 338 additions & 0 deletions definitions/crds/wgpolicyk8s.io_clusterpolicyreports.yaml

Large diffs are not rendered by default.

337 changes: 337 additions & 0 deletions definitions/crds/wgpolicyk8s.io_policyreports.yaml

Large diffs are not rendered by default.

2,818 changes: 1,413 additions & 1,405 deletions definitions/install.yaml

Large diffs are not rendered by default.

2,818 changes: 1,413 additions & 1,405 deletions definitions/install_debug.yaml

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions definitions/k8s-resource/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ metadata:
labels:
rbac.authorization.k8s.io/aggregate-to-view: "true"
rules:
- apiGroups: [ "policy.k8s.io/v1alpha1" ]
- apiGroups: [ "wgpolicyk8s.io/v1alpha1" ]
resources:
- policyreport
verbs: [ "get", "list", "watch" ]
Expand All @@ -336,7 +336,7 @@ metadata:
labels:
rbac.authorization.k8s.io/aggregate-to-admin: "true"
rules:
- apiGroups: ["policy.k8s.io/v1alpha1"]
- apiGroups: ["wgpolicyk8s.io/v1alpha1"]
resources:
- clusterpolicyreport
verbs: ["get", "list", "watch"]
Expand All @@ -349,7 +349,7 @@ metadata:
name: kyverno:edit-policies-policyreport
rules:
- apiGroups:
- policy.k8s.io/v1alpha1
- wgpolicyk8s.io/v1alpha1
resources:
- policyreport
- clusterpolicyreport
Expand All @@ -368,7 +368,7 @@ metadata:
name: kyverno:admin-policyreport
rules:
- apiGroups:
- policy.k8s.io/v1alpha1
- wgpolicyk8s.io/v1alpha1
resources:
- policyreport
- clusterpolicyreport
Expand Down
2,818 changes: 1,413 additions & 1,405 deletions definitions/release/install.yaml

Large diffs are not rendered by default.

24 changes: 22 additions & 2 deletions pkg/api/kyverno/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/api/policyreport/v1alpha1/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ limitations under the License.
// Package v1alpha1 contains API Schema definitions for the policy v1alpha1 API group
// +k8s:deepcopy-gen=package
// +kubebuilder:object:generate=true
// +groupName=policy.k8s.io
// +groupName=wgpolicyk8s.io
package v1alpha1
6 changes: 3 additions & 3 deletions pkg/api/policyreport/v1alpha1/groupversion_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

// Package v1alpha1 contains API Schema definitions for the policy v1alpha1 API group
// +kubebuilder:object:generate=true
// +groupName=policy.k8s.io
// +groupName=wgpolicyk8s.io
package v1alpha1

import (
Expand All @@ -26,10 +26,10 @@ import (

// Package v1alpha1 contains API Schema definitions for the policy v1alpha1 API group
// +kubebuilder:object:generate=true
// +groupName=policy.k8s.io
// +groupName=wgpolicyk8s.io
var (
// SchemeGroupVersion is group version used to register these objects
SchemeGroupVersion = schema.GroupVersion{Group: "policy.k8s.io", Version: "v1alpha1"}
SchemeGroupVersion = schema.GroupVersion{Group: "wgpolicyk8s.io", Version: "v1alpha1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
Expand Down
26 changes: 24 additions & 2 deletions pkg/api/policyreport/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions pkg/client/clientset/versioned/clientset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions pkg/client/clientset/versioned/fake/clientset_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/client/clientset/versioned/fake/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/client/clientset/versioned/scheme/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2292bf8

Please sign in to comment.