Skip to content

Commit 84aec8a

Browse files
authored
Merge pull request #4684 from kersten/chore/networkpolicy-import-alias
🌱 (chore): unify import alias for network-policy
2 parents 31021ee + 3331fff commit 84aec8a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

pkg/plugins/common/kustomize/v2/scaffolds/init.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"sigs.k8s.io/kubebuilder/v4/pkg/plugins"
2525
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault"
2626
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager"
27-
network_policy "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/network-policy"
27+
networkpolicy "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/network-policy"
2828
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus"
2929
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac"
3030
)
@@ -81,8 +81,8 @@ func (s *initScaffolder) Scaffold() error {
8181
&kdefault.CertManagerMetricsPatch{},
8282
&manager.Config{Image: imageName},
8383
&kdefault.Kustomization{},
84-
&network_policy.Kustomization{},
85-
&network_policy.PolicyAllowMetrics{},
84+
&networkpolicy.Kustomization{},
85+
&networkpolicy.PolicyAllowMetrics{},
8686
&prometheus.Kustomization{},
8787
&prometheus.Monitor{},
8888
&prometheus.ServiceMonitorPatch{},

pkg/plugins/common/kustomize/v2/scaffolds/webhook.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd"
3030
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches"
3131
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault"
32-
network_policy "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/network-policy"
32+
networkpolicy "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/network-policy"
3333
"sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook"
3434
)
3535

@@ -88,7 +88,7 @@ func (s *webhookScaffolder) Scaffold() error {
8888
&certmanager.MetricsCertificate{},
8989
&certmanager.Kustomization{},
9090
&certmanager.KustomizeConfig{},
91-
&network_policy.PolicyAllowWebhooks{},
91+
&networkpolicy.PolicyAllowWebhooks{},
9292
}
9393

9494
// Only scaffold the following patches if is a conversion webhook

0 commit comments

Comments
 (0)