diff --git a/Makefile b/Makefile index 40780083d1..52b747ed4c 100644 --- a/Makefile +++ b/Makefile @@ -113,6 +113,8 @@ docker-publish-all: docker-publish-initContainer docker-publish-kyverno docker-p docker-build-all: docker-build-initContainer docker-build-kyverno docker-build-cli +docker-tag-all: docker-tag-repo-initContainer docker-tag-repo-kyverno docker-tag-repo-cli + ################################## # CI Testing ################################## diff --git a/api/swaggerDoc.go b/api/swaggerDoc.go index 3d0b380174..dd3c96fc19 100644 --- a/api/swaggerDoc.go +++ b/api/swaggerDoc.go @@ -26,7 +26,7 @@ const SwaggerDoc = ` "type": "string" }, "name": { - "description": "The name of the admission webhook. Name should be fully qualified, e.g., imagepolicy.kubernetes.io, where \"imagepolicy\" is the name of the webhook, and kubernetes.io is the name of the organization. Required.", + "description": "The name of the admission webhook. Name should be fully qualified, e.g., imagepolicy.k8s.io/v1alpha1, where \"imagepolicy\" is the name of the webhook, and kubernetes.io is the name of the organization. Required.", "type": "string" }, "namespaceSelector": { @@ -223,7 +223,7 @@ const SwaggerDoc = ` "type": "string" }, "name": { - "description": "The name of the admission webhook. Name should be fully qualified, e.g., imagepolicy.kubernetes.io, where \"imagepolicy\" is the name of the webhook, and kubernetes.io is the name of the organization. Required.", + "description": "The name of the admission webhook. Name should be fully qualified, e.g., imagepolicy.k8s.io/v1alpha1, where \"imagepolicy\" is the name of the webhook, and kubernetes.io is the name of the organization. Required.", "type": "string" }, "namespaceSelector": { @@ -370,7 +370,7 @@ const SwaggerDoc = ` "type": "string" }, "name": { - "description": "The name of the admission webhook. Name should be fully qualified, e.g., imagepolicy.kubernetes.io, where \"imagepolicy\" is the name of the webhook, and kubernetes.io is the name of the organization. Required.", + "description": "The name of the admission webhook. Name should be fully qualified, e.g., imagepolicy.k8s.io/v1alpha1, where \"imagepolicy\" is the name of the webhook, and kubernetes.io is the name of the organization. Required.", "type": "string" }, "namespaceSelector": { @@ -565,7 +565,7 @@ const SwaggerDoc = ` "type": "string" }, "name": { - "description": "The name of the admission webhook. Name should be fully qualified, e.g., imagepolicy.kubernetes.io, where \"imagepolicy\" is the name of the webhook, and kubernetes.io is the name of the organization. Required.", + "description": "The name of the admission webhook. Name should be fully qualified, e.g., imagepolicy.k8s.io/v1alpha1, where \"imagepolicy\" is the name of the webhook, and kubernetes.io is the name of the organization. Required.", "type": "string" }, "namespaceSelector": { diff --git a/charts/kyverno/crds/crds.yaml b/charts/kyverno/crds/crds.yaml index 51f78e1bbe..67f0066f6f 100644 --- a/charts/kyverno/crds/crds.yaml +++ b/charts/kyverno/crds/crds.yaml @@ -277,7 +277,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.5 creationTimestamp: null - name: clusterpolicyreports.policy.kubernetes.io + name: clusterpolicyreports.policy.k8s.io spec: additionalPrinterColumns: - JSONPath: .scope.kind @@ -306,7 +306,7 @@ spec: - JSONPath: .metadata.creationTimestamp name: Age type: date - group: policy.kubernetes.io + group: policy.k8s.io names: kind: ClusterPolicyReport listKind: ClusterPolicyReportList @@ -684,7 +684,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.5 creationTimestamp: null - name: clusterreportchangerequests.policy.kubernetes.io + name: clusterreportchangerequests.policy.k8s.io spec: additionalPrinterColumns: - JSONPath: .scope.kind @@ -713,7 +713,7 @@ spec: - JSONPath: .metadata.creationTimestamp name: Age type: date - group: policy.kubernetes.io + group: policy.k8s.io names: kind: ClusterReportChangeRequest listKind: ClusterReportChangeRequestList @@ -1340,7 +1340,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.5 creationTimestamp: null - name: policyreports.policy.kubernetes.io + name: policyreports.policy.k8s.io spec: additionalPrinterColumns: - JSONPath: .scope.kind @@ -1369,7 +1369,7 @@ spec: - JSONPath: .metadata.creationTimestamp name: Age type: date - group: policy.kubernetes.io + group: policy.k8s.io names: kind: PolicyReport listKind: PolicyReportList @@ -1746,7 +1746,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.5 creationTimestamp: null - name: reportchangerequests.policy.kubernetes.io + name: reportchangerequests.policy.k8s.io spec: additionalPrinterColumns: - JSONPath: .scope.kind @@ -1775,7 +1775,7 @@ spec: - JSONPath: .metadata.creationTimestamp name: Age type: date - group: policy.kubernetes.io + group: policy.k8s.io names: kind: ReportChangeRequest listKind: ReportChangeRequestList diff --git a/definitions/crds/kustomization.yaml b/definitions/crds/kustomization.yaml index 19d4272f7a..188e4e1609 100755 --- a/definitions/crds/kustomization.yaml +++ b/definitions/crds/kustomization.yaml @@ -3,7 +3,7 @@ kind: Kustomization resources: - ./crds.yaml -- ./policy.kubernetes.io_clusterpolicyreports.yaml -- ./policy.kubernetes.io_policyreports.yaml -- ./policy.kubernetes.io_clusterreportchangerequests.yaml -- ./policy.kubernetes.io_reportchangerequests.yaml \ No newline at end of file +- ./policy.k8s.io_clusterpolicyreports.yaml +- ./policy.k8s.io_policyreports.yaml +- ./policy.k8s.io_clusterreportchangerequests.yaml +- ./policy.k8s.io_reportchangerequests.yaml \ No newline at end of file diff --git a/definitions/crds/policy.kubernetes.io_clusterpolicyreports.yaml b/definitions/crds/policy.k8s.io_clusterpolicyreports.yaml similarity index 99% rename from definitions/crds/policy.kubernetes.io_clusterpolicyreports.yaml rename to definitions/crds/policy.k8s.io_clusterpolicyreports.yaml index 2f45845e62..8de83d5524 100644 --- a/definitions/crds/policy.kubernetes.io_clusterpolicyreports.yaml +++ b/definitions/crds/policy.k8s.io_clusterpolicyreports.yaml @@ -6,7 +6,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.5 creationTimestamp: null - name: clusterpolicyreports.policy.kubernetes.io + name: clusterpolicyreports.policy.k8s.io spec: additionalPrinterColumns: - JSONPath: .scope.kind @@ -35,7 +35,7 @@ spec: - JSONPath: .metadata.creationTimestamp name: Age type: date - group: policy.kubernetes.io + group: policy.k8s.io names: kind: ClusterPolicyReport listKind: ClusterPolicyReportList diff --git a/definitions/crds/policy.kubernetes.io_clusterreportchangerequests.yaml b/definitions/crds/policy.k8s.io_clusterreportchangerequests.yaml similarity index 99% rename from definitions/crds/policy.kubernetes.io_clusterreportchangerequests.yaml rename to definitions/crds/policy.k8s.io_clusterreportchangerequests.yaml index 73c882da1b..7482281d36 100644 --- a/definitions/crds/policy.kubernetes.io_clusterreportchangerequests.yaml +++ b/definitions/crds/policy.k8s.io_clusterreportchangerequests.yaml @@ -6,7 +6,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.5 creationTimestamp: null - name: clusterreportchangerequests.policy.kubernetes.io + name: clusterreportchangerequests.policy.k8s.io spec: additionalPrinterColumns: - JSONPath: .scope.kind @@ -35,7 +35,7 @@ spec: - JSONPath: .metadata.creationTimestamp name: Age type: date - group: policy.kubernetes.io + group: policy.k8s.io names: kind: ClusterReportChangeRequest listKind: ClusterReportChangeRequestList diff --git a/definitions/crds/policy.kubernetes.io_policyreports.yaml b/definitions/crds/policy.k8s.io_policyreports.yaml similarity index 99% rename from definitions/crds/policy.kubernetes.io_policyreports.yaml rename to definitions/crds/policy.k8s.io_policyreports.yaml index 2f25231794..aaf618ca1d 100644 --- a/definitions/crds/policy.kubernetes.io_policyreports.yaml +++ b/definitions/crds/policy.k8s.io_policyreports.yaml @@ -6,7 +6,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.5 creationTimestamp: null - name: policyreports.policy.kubernetes.io + name: policyreports.policy.k8s.io spec: additionalPrinterColumns: - JSONPath: .scope.kind @@ -35,7 +35,7 @@ spec: - JSONPath: .metadata.creationTimestamp name: Age type: date - group: policy.kubernetes.io + group: policy.k8s.io names: kind: PolicyReport listKind: PolicyReportList diff --git a/definitions/crds/policy.kubernetes.io_reportchangerequests.yaml b/definitions/crds/policy.k8s.io_reportchangerequests.yaml similarity index 99% rename from definitions/crds/policy.kubernetes.io_reportchangerequests.yaml rename to definitions/crds/policy.k8s.io_reportchangerequests.yaml index cf4e729f0b..a9dfae563e 100644 --- a/definitions/crds/policy.kubernetes.io_reportchangerequests.yaml +++ b/definitions/crds/policy.k8s.io_reportchangerequests.yaml @@ -6,7 +6,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.5 creationTimestamp: null - name: reportchangerequests.policy.kubernetes.io + name: reportchangerequests.policy.k8s.io spec: additionalPrinterColumns: - JSONPath: .scope.kind @@ -35,7 +35,7 @@ spec: - JSONPath: .metadata.creationTimestamp name: Age type: date - group: policy.kubernetes.io + group: policy.k8s.io names: kind: ReportChangeRequest listKind: ReportChangeRequestList diff --git a/definitions/install.yaml b/definitions/install.yaml index 93a5d121af..19752f5a3c 100755 --- a/definitions/install.yaml +++ b/definitions/install.yaml @@ -282,7 +282,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.5 creationTimestamp: null - name: clusterpolicyreports.policy.kubernetes.io + name: clusterpolicyreports.policy.k8s.io spec: additionalPrinterColumns: - JSONPath: .scope.kind @@ -311,7 +311,7 @@ spec: - JSONPath: .metadata.creationTimestamp name: Age type: date - group: policy.kubernetes.io + group: policy.k8s.io names: kind: ClusterPolicyReport listKind: ClusterPolicyReportList @@ -689,7 +689,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.5 creationTimestamp: null - name: clusterreportchangerequests.policy.kubernetes.io + name: clusterreportchangerequests.policy.k8s.io spec: additionalPrinterColumns: - JSONPath: .scope.kind @@ -718,7 +718,7 @@ spec: - JSONPath: .metadata.creationTimestamp name: Age type: date - group: policy.kubernetes.io + group: policy.k8s.io names: kind: ClusterReportChangeRequest listKind: ClusterReportChangeRequestList @@ -1345,7 +1345,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.5 creationTimestamp: null - name: policyreports.policy.kubernetes.io + name: policyreports.policy.k8s.io spec: additionalPrinterColumns: - JSONPath: .scope.kind @@ -1374,7 +1374,7 @@ spec: - JSONPath: .metadata.creationTimestamp name: Age type: date - group: policy.kubernetes.io + group: policy.k8s.io names: kind: PolicyReport listKind: PolicyReportList @@ -1751,7 +1751,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.5 creationTimestamp: null - name: reportchangerequests.policy.kubernetes.io + name: reportchangerequests.policy.k8s.io spec: additionalPrinterColumns: - JSONPath: .scope.kind @@ -1780,7 +1780,7 @@ spec: - JSONPath: .metadata.creationTimestamp name: Age type: date - group: policy.kubernetes.io + group: policy.k8s.io names: kind: ReportChangeRequest listKind: ReportChangeRequestList @@ -2246,7 +2246,7 @@ metadata: name: kyverno:admin-policyreport rules: - apiGroups: - - policy.kubernetes.io + - policy.k8s.io/v1alpha1 resources: - policyreport - clusterpolicyreport @@ -2261,7 +2261,7 @@ metadata: name: kyverno:edit-policies-policyreport rules: - apiGroups: - - policy.kubernetes.io + - policy.k8s.io/v1alpha1 resources: - policyreport - clusterpolicyreport @@ -2326,7 +2326,7 @@ metadata: name: kyverno:view-clusterpolicyreport rules: - apiGroups: - - policy.kubernetes.io + - policy.k8s.io/v1alpha1 resources: - clusterpolicyreport verbs: @@ -2375,7 +2375,7 @@ metadata: name: kyverno:view-policyreport rules: - apiGroups: - - policy.kubernetes.io + - policy.k8s.io/v1alpha1 resources: - policyreport verbs: diff --git a/definitions/install_debug.yaml b/definitions/install_debug.yaml index 947cb8626f..83bc629e1b 100755 --- a/definitions/install_debug.yaml +++ b/definitions/install_debug.yaml @@ -282,7 +282,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.5 creationTimestamp: null - name: clusterpolicyreports.policy.kubernetes.io + name: clusterpolicyreports.policy.k8s.io spec: additionalPrinterColumns: - JSONPath: .scope.kind @@ -311,7 +311,7 @@ spec: - JSONPath: .metadata.creationTimestamp name: Age type: date - group: policy.kubernetes.io + group: policy.k8s.io names: kind: ClusterPolicyReport listKind: ClusterPolicyReportList @@ -689,7 +689,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.5 creationTimestamp: null - name: clusterreportchangerequests.policy.kubernetes.io + name: clusterreportchangerequests.policy.k8s.io spec: additionalPrinterColumns: - JSONPath: .scope.kind @@ -718,7 +718,7 @@ spec: - JSONPath: .metadata.creationTimestamp name: Age type: date - group: policy.kubernetes.io + group: policy.k8s.io names: kind: ClusterReportChangeRequest listKind: ClusterReportChangeRequestList @@ -1345,7 +1345,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.5 creationTimestamp: null - name: policyreports.policy.kubernetes.io + name: policyreports.policy.k8s.io spec: additionalPrinterColumns: - JSONPath: .scope.kind @@ -1374,7 +1374,7 @@ spec: - JSONPath: .metadata.creationTimestamp name: Age type: date - group: policy.kubernetes.io + group: policy.k8s.io names: kind: PolicyReport listKind: PolicyReportList @@ -1751,7 +1751,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.5 creationTimestamp: null - name: reportchangerequests.policy.kubernetes.io + name: reportchangerequests.policy.k8s.io spec: additionalPrinterColumns: - JSONPath: .scope.kind @@ -1780,7 +1780,7 @@ spec: - JSONPath: .metadata.creationTimestamp name: Age type: date - group: policy.kubernetes.io + group: policy.k8s.io names: kind: ReportChangeRequest listKind: ReportChangeRequestList @@ -2246,7 +2246,7 @@ metadata: name: kyverno:admin-policyreport rules: - apiGroups: - - policy.kubernetes.io + - policy.k8s.io/v1alpha1 resources: - policyreport - clusterpolicyreport @@ -2261,7 +2261,7 @@ metadata: name: kyverno:edit-policies-policyreport rules: - apiGroups: - - policy.kubernetes.io + - policy.k8s.io/v1alpha1 resources: - policyreport - clusterpolicyreport @@ -2326,7 +2326,7 @@ metadata: name: kyverno:view-clusterpolicyreport rules: - apiGroups: - - policy.kubernetes.io + - policy.k8s.io/v1alpha1 resources: - clusterpolicyreport verbs: @@ -2375,7 +2375,7 @@ metadata: name: kyverno:view-policyreport rules: - apiGroups: - - policy.kubernetes.io + - policy.k8s.io/v1alpha1 resources: - policyreport verbs: diff --git a/definitions/k8s-resource/rbac.yaml b/definitions/k8s-resource/rbac.yaml index 667316b3a7..230bba6108 100755 --- a/definitions/k8s-resource/rbac.yaml +++ b/definitions/k8s-resource/rbac.yaml @@ -317,7 +317,7 @@ metadata: labels: rbac.authorization.k8s.io/aggregate-to-view: "true" rules: - - apiGroups: [ "policy.kubernetes.io" ] + - apiGroups: [ "policy.k8s.io/v1alpha1" ] resources: - policyreport verbs: [ "get", "list", "watch" ] @@ -330,7 +330,7 @@ metadata: labels: rbac.authorization.k8s.io/aggregate-to-admin: "true" rules: - - apiGroups: ["policy.kubernetes.io"] + - apiGroups: ["policy.k8s.io/v1alpha1"] resources: - clusterpolicyreport verbs: ["get", "list", "watch"] @@ -343,7 +343,7 @@ metadata: name: kyverno:edit-policies-policyreport rules: - apiGroups: - - policy.kubernetes.io + - policy.k8s.io/v1alpha1 resources: - policyreport - clusterpolicyreport @@ -362,7 +362,7 @@ metadata: name: kyverno:admin-policyreport rules: - apiGroups: - - policy.kubernetes.io + - policy.k8s.io/v1alpha1 resources: - policyreport - clusterpolicyreport diff --git a/pkg/api/policyreport/v1alpha1/doc.go b/pkg/api/policyreport/v1alpha1/doc.go index dc344b7046..366c165158 100755 --- a/pkg/api/policyreport/v1alpha1/doc.go +++ b/pkg/api/policyreport/v1alpha1/doc.go @@ -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.kubernetes.io +// +groupName=policy.k8s.io package v1alpha1 diff --git a/pkg/api/policyreport/v1alpha1/groupversion_info.go b/pkg/api/policyreport/v1alpha1/groupversion_info.go index 943724b21a..296fe28b91 100755 --- a/pkg/api/policyreport/v1alpha1/groupversion_info.go +++ b/pkg/api/policyreport/v1alpha1/groupversion_info.go @@ -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.kubernetes.io +// +groupName=policy.k8s.io package v1alpha1 import ( @@ -26,10 +26,10 @@ import ( // Package v1alpha1 contains API Schema definitions for the policy v1alpha1 API group // +kubebuilder:object:generate=true -// +groupName=policy.kubernetes.io +// +groupName=policy.k8s.io var ( // SchemeGroupVersion is group version used to register these objects - SchemeGroupVersion = schema.GroupVersion{Group: "policy.kubernetes.io", Version: "v1alpha1"} + SchemeGroupVersion = schema.GroupVersion{Group: "policy.k8s.io", Version: "v1alpha1"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion} diff --git a/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/fake/fake_clusterpolicyreport.go b/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/fake/fake_clusterpolicyreport.go index d6e9ee9474..17f455a342 100755 --- a/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/fake/fake_clusterpolicyreport.go +++ b/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/fake/fake_clusterpolicyreport.go @@ -35,9 +35,9 @@ type FakeClusterPolicyReports struct { Fake *FakePolicyV1alpha1 } -var clusterpolicyreportsResource = schema.GroupVersionResource{Group: "policy.kubernetes.io", Version: "v1alpha1", Resource: "clusterpolicyreports"} +var clusterpolicyreportsResource = schema.GroupVersionResource{Group: "policy.k8s.io", Version: "v1alpha1", Resource: "clusterpolicyreports"} -var clusterpolicyreportsKind = schema.GroupVersionKind{Group: "policy.kubernetes.io", Version: "v1alpha1", Kind: "ClusterPolicyReport"} +var clusterpolicyreportsKind = schema.GroupVersionKind{Group: "policy.k8s.io", Version: "v1alpha1", Kind: "ClusterPolicyReport"} // Get takes name of the clusterPolicyReport, and returns the corresponding clusterPolicyReport object, and an error if there is any. func (c *FakeClusterPolicyReports) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.ClusterPolicyReport, err error) { diff --git a/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/fake/fake_clusterreportchangerequest.go b/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/fake/fake_clusterreportchangerequest.go index 4c8769518a..a8a57da1b5 100644 --- a/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/fake/fake_clusterreportchangerequest.go +++ b/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/fake/fake_clusterreportchangerequest.go @@ -35,9 +35,9 @@ type FakeClusterReportChangeRequests struct { Fake *FakePolicyV1alpha1 } -var clusterreportchangerequestsResource = schema.GroupVersionResource{Group: "policy.kubernetes.io", Version: "v1alpha1", Resource: "clusterreportchangerequests"} +var clusterreportchangerequestsResource = schema.GroupVersionResource{Group: "policy.k8s.io", Version: "v1alpha1", Resource: "clusterreportchangerequests"} -var clusterreportchangerequestsKind = schema.GroupVersionKind{Group: "policy.kubernetes.io", Version: "v1alpha1", Kind: "ClusterReportChangeRequest"} +var clusterreportchangerequestsKind = schema.GroupVersionKind{Group: "policy.k8s.io", Version: "v1alpha1", Kind: "ClusterReportChangeRequest"} // Get takes name of the clusterReportChangeRequest, and returns the corresponding clusterReportChangeRequest object, and an error if there is any. func (c *FakeClusterReportChangeRequests) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.ClusterReportChangeRequest, err error) { diff --git a/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/fake/fake_policyreport.go b/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/fake/fake_policyreport.go index bba766071a..9f4054b25e 100755 --- a/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/fake/fake_policyreport.go +++ b/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/fake/fake_policyreport.go @@ -36,9 +36,9 @@ type FakePolicyReports struct { ns string } -var policyreportsResource = schema.GroupVersionResource{Group: "policy.kubernetes.io", Version: "v1alpha1", Resource: "policyreports"} +var policyreportsResource = schema.GroupVersionResource{Group: "policy.k8s.io", Version: "v1alpha1", Resource: "policyreports"} -var policyreportsKind = schema.GroupVersionKind{Group: "policy.kubernetes.io", Version: "v1alpha1", Kind: "PolicyReport"} +var policyreportsKind = schema.GroupVersionKind{Group: "policy.k8s.io", Version: "v1alpha1", Kind: "PolicyReport"} // Get takes name of the policyReport, and returns the corresponding policyReport object, and an error if there is any. func (c *FakePolicyReports) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.PolicyReport, err error) { diff --git a/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/fake/fake_reportchangerequest.go b/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/fake/fake_reportchangerequest.go index 67e45e6921..9ec6c25b87 100644 --- a/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/fake/fake_reportchangerequest.go +++ b/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/fake/fake_reportchangerequest.go @@ -36,9 +36,9 @@ type FakeReportChangeRequests struct { ns string } -var reportchangerequestsResource = schema.GroupVersionResource{Group: "policy.kubernetes.io", Version: "v1alpha1", Resource: "reportchangerequests"} +var reportchangerequestsResource = schema.GroupVersionResource{Group: "policy.k8s.io", Version: "v1alpha1", Resource: "reportchangerequests"} -var reportchangerequestsKind = schema.GroupVersionKind{Group: "policy.kubernetes.io", Version: "v1alpha1", Kind: "ReportChangeRequest"} +var reportchangerequestsKind = schema.GroupVersionKind{Group: "policy.k8s.io", Version: "v1alpha1", Kind: "ReportChangeRequest"} // Get takes name of the reportChangeRequest, and returns the corresponding reportChangeRequest object, and an error if there is any. func (c *FakeReportChangeRequests) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.ReportChangeRequest, err error) { diff --git a/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/policyreport_client.go b/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/policyreport_client.go index f473e19a29..f559309fb3 100755 --- a/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/policyreport_client.go +++ b/pkg/client/clientset/versioned/typed/policyreport/v1alpha1/policyreport_client.go @@ -32,7 +32,7 @@ type PolicyV1alpha1Interface interface { ReportChangeRequestsGetter } -// PolicyV1alpha1Client is used to interact with features provided by the policy.kubernetes.io group. +// PolicyV1alpha1Client is used to interact with features provided by the policy.k8s.io group. type PolicyV1alpha1Client struct { restClient rest.Interface } diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index a76c885f11..c03bb66124 100755 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -65,7 +65,7 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource case v1.SchemeGroupVersion.WithResource("policyviolations"): return &genericInformer{resource: resource.GroupResource(), informer: f.Kyverno().V1().PolicyViolations().Informer()}, nil - // Group=policy.kubernetes.io, Version=v1alpha1 + // Group=policy.k8s.io, Version=v1alpha1 case v1alpha1.SchemeGroupVersion.WithResource("clusterpolicyreports"): return &genericInformer{resource: resource.GroupResource(), informer: f.Policy().V1alpha1().ClusterPolicyReports().Informer()}, nil case v1alpha1.SchemeGroupVersion.WithResource("clusterreportchangerequests"): diff --git a/pkg/kyverno/apply/generate.go b/pkg/kyverno/apply/generate.go index 493d6dd1d6..6a3239ed54 100644 --- a/pkg/kyverno/apply/generate.go +++ b/pkg/kyverno/apply/generate.go @@ -84,7 +84,7 @@ func mergeClusterReport(reports []*unstructured.Unstructured) (*unstructured.Uns res := &unstructured.Unstructured{} res.SetName(clusterpolicyreport) res.SetKind("ClusterPolicyReport") - res.SetAPIVersion("policy.kubernetes.io/v1alpha1") + res.SetAPIVersion("policy.k8s.io/v1alpha1") for _, report := range reports { if report.GetNamespace() != "" { diff --git a/pkg/kyverno/apply/generate_test.go b/pkg/kyverno/apply/generate_test.go index 33b97547c3..0551b6f9a1 100644 --- a/pkg/kyverno/apply/generate_test.go +++ b/pkg/kyverno/apply/generate_test.go @@ -12,7 +12,7 @@ func Test_mergeClusterReport(t *testing.T) { reports := []*unstructured.Unstructured{ { Object: map[string]interface{}{ - "apiVersion": "policy.kubernetes.io/v1alpha1", + "apiVersion": "policy.k8s.io/v1alpha1", "kind": "PolicyReport", "metadata": map[string]interface{}{ "name": "ns-polr-1", @@ -29,7 +29,7 @@ func Test_mergeClusterReport(t *testing.T) { }, { Object: map[string]interface{}{ - "apiVersion": "policy.kubernetes.io/v1alpha1", + "apiVersion": "policy.k8s.io/v1alpha1", "kind": "PolicyReport", "metadata": map[string]interface{}{ "name": "ns-polr-2", @@ -59,7 +59,7 @@ func Test_mergeClusterReport(t *testing.T) { }, { Object: map[string]interface{}{ - "apiVersion": "policy.kubernetes.io/v1alpha1", + "apiVersion": "policy.k8s.io/v1alpha1", "kind": "ClusterPolicyReport", "metadata": map[string]interface{}{ "name": "cpolr-4", @@ -74,7 +74,7 @@ func Test_mergeClusterReport(t *testing.T) { }, { Object: map[string]interface{}{ - "apiVersion": "policy.kubernetes.io/v1alpha1", + "apiVersion": "policy.k8s.io/v1alpha1", "kind": "ClusterPolicyReport", "metadata": map[string]interface{}{ "name": "cpolr-5", @@ -113,7 +113,7 @@ func Test_mergeClusterReport(t *testing.T) { cpolr, err := mergeClusterReport(reports) assert.NilError(t, err) - assert.Assert(t, cpolr.GetAPIVersion() == "policy.kubernetes.io/v1alpha1", cpolr.GetAPIVersion()) + assert.Assert(t, cpolr.GetAPIVersion() == "policy.k8s.io/v1alpha1", cpolr.GetAPIVersion()) assert.Assert(t, cpolr.GetKind() == "ClusterPolicyReport", cpolr.GetKind()) entries, _, err := unstructured.NestedSlice(cpolr.UnstructuredContent(), "results") diff --git a/pkg/kyverno/apply/report.go b/pkg/kyverno/apply/report.go index 418a43d141..a0a3840d65 100644 --- a/pkg/kyverno/apply/report.go +++ b/pkg/kyverno/apply/report.go @@ -27,7 +27,7 @@ func buildPolicyReports(resps []response.EngineResponse) (res []*unstructured.Un if scope == clusterpolicyreport { report := &report.ClusterPolicyReport{ TypeMeta: metav1.TypeMeta{ - APIVersion: "policy.kubernetes.io/v1alpha1", + APIVersion: "policy.k8s.io/v1alpha1", Kind: "ClusterPolicyReport", }, Results: result, @@ -41,7 +41,7 @@ func buildPolicyReports(resps []response.EngineResponse) (res []*unstructured.Un } else { report := &report.PolicyReport{ TypeMeta: metav1.TypeMeta{ - APIVersion: "policy.kubernetes.io/v1alpha1", + APIVersion: "policy.k8s.io/v1alpha1", Kind: "PolicyReport", }, Results: result, diff --git a/pkg/policyreport/builder.go b/pkg/policyreport/builder.go index 6257a14211..0f69453726 100755 --- a/pkg/policyreport/builder.go +++ b/pkg/policyreport/builder.go @@ -156,7 +156,7 @@ func set(obj *unstructured.Unstructured, name string, info Info) { resource := info.Resource obj.SetName(name) obj.SetNamespace(config.KubePolicyNamespace) - obj.SetAPIVersion("policy.kubernetes.io/v1alpha1") + obj.SetAPIVersion("policy.k8s.io/v1alpha1") if resource.GetNamespace() == "" { obj.SetKind("ClusterReportChangeRequest") } else { diff --git a/pkg/policyreport/reportcontroller.go b/pkg/policyreport/reportcontroller.go index ced7e50a0b..51960e8012 100644 --- a/pkg/policyreport/reportcontroller.go +++ b/pkg/policyreport/reportcontroller.go @@ -460,7 +460,7 @@ func mergeRequests(ns *v1.Namespace, requestsGeneral interface{}) (*unstructured } func setReport(report *unstructured.Unstructured, ns *v1.Namespace) { - report.SetAPIVersion("policy.kubernetes.io/v1alpha1") + report.SetAPIVersion("policy.k8s.io/v1alpha1") if ns == nil { report.SetName(generatePolicyReportName("")) diff --git a/pkg/policyreport/reportrequest.go b/pkg/policyreport/reportrequest.go index 88add4fe4b..47fa411043 100755 --- a/pkg/policyreport/reportrequest.go +++ b/pkg/policyreport/reportrequest.go @@ -277,7 +277,7 @@ func (gen *Generator) sync(reportReq *unstructured.Unstructured, info Info) erro if err != nil { if apierrors.IsNotFound(err) { if _, err = gen.dclient.CreateResource(reportReq.GetAPIVersion(), reportReq.GetKind(), config.KubePolicyNamespace, reportReq, false); err != nil { - return fmt.Errorf("failed to create %s: %v", reportReq.GetKind(), err) + return fmt.Errorf("failed to create ReportChangeRequest: %v", err) } logger.V(3).Info("successfully created reportChangeRequest", "name", reportReq.GetName())