Skip to content

Commit aad472a

Browse files
Merge pull request #403 from kubewarden/apigroup-networkenforcer
chore: rename API group to `networkenforcer.kubewarden.io`
2 parents 557e26d + 02ecd9c commit aad472a

21 files changed

Lines changed: 78 additions & 78 deletions

api/v1alpha1/groupversion_info.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
// Package v1alpha1 contains API Schema definitions for the security v1alpha1 API group.
1818
// +kubebuilder:object:generate=true
19-
// +groupName=security.kubewarden.io
19+
// +groupName=networkenforcer.kubewarden.io
2020
package v1alpha1
2121

2222
import (
@@ -27,7 +27,7 @@ import (
2727

2828
var (
2929
//nolint:gochecknoglobals // Kubebuilder API registration requires package-level variables
30-
GroupVersion = schema.GroupVersion{Group: "security.kubewarden.io", Version: "v1alpha1"}
30+
GroupVersion = schema.GroupVersion{Group: "networkenforcer.kubewarden.io", Version: "v1alpha1"}
3131
//nolint:gochecknoglobals // Kubebuilder API registration requires package-level variables
3232
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
3333
//nolint:gochecknoglobals // Kubebuilder API registration requires package-level variables

api/v1alpha1/keys.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ const (
44
// ProposalPromoteLabelKey is set on a WorkloadNetworkPolicyProposal when it
55
// is promoted to a WorkloadNetworkPolicy.
66
// Valid values are WorkloadNetworkPolicyMode strings ("monitor", "protect").
7-
ProposalPromoteLabelKey = "security.kubewarden.io/promote"
7+
ProposalPromoteLabelKey = "networkenforcer.kubewarden.io/promote"
88

99
// PolicyPromotedFromLabelKey is set on a WorkloadNetworkPolicy when it is
1010
// created by promoting a WorkloadNetworkPolicyProposal.
11-
PolicyPromotedFromLabelKey = "security.kubewarden.io/promoted-from"
11+
PolicyPromotedFromLabelKey = "networkenforcer.kubewarden.io/promoted-from"
1212

1313
// ViolationAcknowledgePrefix is the prefix of annotation key used to acknowledge a violation.
14-
// An annotation of the form security.kubewarden.io/acknowledge-<id>: "<reason>" moves the
14+
// An annotation of the form networkenforcer.kubewarden.io/acknowledge-<id>: "<reason>" moves the
1515
// violation record with that ID into AcknowledgedViolations.
16-
ViolationAcknowledgePrefix = "security.kubewarden.io/acknowledge-"
16+
ViolationAcknowledgePrefix = "networkenforcer.kubewarden.io/acknowledge-"
1717
)

api/v1alpha1/samples/security_v1alpha1_istio_workloadnetworkpolicy.yaml renamed to api/v1alpha1/samples/networkenforcer_v1alpha1_istio_workloadnetworkpolicy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: security.kubewarden.io/v1alpha1
1+
apiVersion: networkenforcer.kubewarden.io/v1alpha1
22
kind: WorkloadNetworkPolicy
33
metadata:
44
name: istio-networkpolicy-sample

api/v1alpha1/samples/security_v1alpha1_workloadnetworkpolicy.yaml renamed to api/v1alpha1/samples/networkenforcer_v1alpha1_workloadnetworkpolicy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: security.kubewarden.io/v1alpha1
1+
apiVersion: networkenforcer.kubewarden.io/v1alpha1
22
kind: WorkloadNetworkPolicy
33
metadata:
44
name: networkpolicy-sample

api/v1alpha1/samples/security_v1alpha1_workloadnetworkpolicyproposal.yaml renamed to api/v1alpha1/samples/networkenforcer_v1alpha1_workloadnetworkpolicyproposal.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: security.kubewarden.io/v1alpha1
1+
apiVersion: networkenforcer.kubewarden.io/v1alpha1
22
kind: WorkloadNetworkPolicyProposal
33
metadata:
44
name: deployment-nginx-deployment-ingress

api/v1alpha1/violation_record.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ func (s *WorkloadNetworkPolicyStatus) mergeScrapedViolations(scraped []Violation
326326
}
327327
}
328328

329-
// acknowledgeViolationsFromAnnotations processes security.kubewarden.io/acknowledge-<id>
329+
// acknowledgeViolationsFromAnnotations processes networkenforcer.kubewarden.io/acknowledge-<id>
330330
// annotations and moves matching violations into AcknowledgedViolations.
331331
func (wnp *WorkloadNetworkPolicy) acknowledgeViolationsFromAnnotations(now metav1.Time) []AcknowledgedViolationRecord {
332332
annotations := wnp.GetAnnotations()

api/v1alpha1/workloadnetworkpolicy_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ type WorkloadNetworkPolicyStatus struct {
8787
// WorkloadNetworkPolicy is the schema for the runtime network policy API.
8888
// Spec carries a backend-specific policy payload (Kubernetes or Istio) and a
8989
// mode (monitor or protect). The resource is intentionally namespaced and uses
90-
// the `security.kubewarden.io` group to avoid colliding with the upstream
90+
// the `networkenforcer.kubewarden.io` group to avoid colliding with the upstream
9191
// `networking.k8s.io/NetworkPolicy` kind.
9292
//
9393
// +kubebuilder:object:root=true

charts/network-enforcer/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ annotations:
1212
catalog.cattle.io/ui-component: network-enforcer
1313
catalog.cattle.io/display-name: NetworkEnforcer
1414
catalog.cattle.io/os: linux
15-
catalog.cattle.io/provides-gvr: "security.kubewarden.io/v1alpha1"
15+
catalog.cattle.io/provides-gvr: "networkenforcer.kubewarden.io/v1alpha1"
1616
catalog.cattle.io/requests-cpu: "500m"
1717
catalog.cattle.io/requests-memory: "128Mi"
1818
catalog.cattle.io/rancher-version: ">= 2.6.0-0 <= 2.12.100-0"

charts/network-enforcer/templates/controller/role.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ rules:
2525
- list
2626
- watch
2727
- apiGroups:
28-
- networking.k8s.io
28+
- networkenforcer.kubewarden.io
2929
resources:
30-
- networkpolicies
30+
- workloadnetworkpolicies
31+
- workloadnetworkpolicyproposals
3132
verbs:
3233
- create
3334
- delete
@@ -37,22 +38,17 @@ rules:
3738
- update
3839
- watch
3940
- apiGroups:
40-
- security.istio.io
41+
- networkenforcer.kubewarden.io
4142
resources:
42-
- authorizationpolicies
43+
- workloadnetworkpolicies/status
4344
verbs:
44-
- create
45-
- delete
4645
- get
47-
- list
4846
- patch
4947
- update
50-
- watch
5148
- apiGroups:
52-
- security.kubewarden.io
49+
- networking.k8s.io
5350
resources:
54-
- workloadnetworkpolicies
55-
- workloadnetworkpolicyproposals
51+
- networkpolicies
5652
verbs:
5753
- create
5854
- delete
@@ -62,10 +58,14 @@ rules:
6258
- update
6359
- watch
6460
- apiGroups:
65-
- security.kubewarden.io
61+
- security.istio.io
6662
resources:
67-
- workloadnetworkpolicies/status
63+
- authorizationpolicies
6864
verbs:
65+
- create
66+
- delete
6967
- get
68+
- list
7069
- patch
7170
- update
71+
- watch

charts/network-enforcer/templates/crd/security.kubewarden.io_workloadnetworkpolicies.yaml renamed to charts/network-enforcer/templates/crd/networkenforcer.kubewarden.io_workloadnetworkpolicies.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.20.1
7-
name: workloadnetworkpolicies.security.kubewarden.io
7+
name: workloadnetworkpolicies.networkenforcer.kubewarden.io
88
spec:
9-
group: security.kubewarden.io
9+
group: networkenforcer.kubewarden.io
1010
names:
1111
kind: WorkloadNetworkPolicy
1212
listKind: WorkloadNetworkPolicyList
@@ -33,7 +33,7 @@ spec:
3333
WorkloadNetworkPolicy is the schema for the runtime network policy API.
3434
Spec carries a backend-specific policy payload (Kubernetes or Istio) and a
3535
mode (monitor or protect). The resource is intentionally namespaced and uses
36-
the `security.kubewarden.io` group to avoid colliding with the upstream
36+
the `networkenforcer.kubewarden.io` group to avoid colliding with the upstream
3737
`networking.k8s.io/NetworkPolicy` kind.
3838
properties:
3939
apiVersion:

0 commit comments

Comments
 (0)