Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ build-installer: set-image-controller generate ## Generate a consolidated YAML w

.PHONY: set-image-controller
set-image-controller: manifests kustomize
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
cd config/manager && $(KUSTOMIZE) edit set image ghcr.io/datum-cloud/network-services-operator=${IMG}

.PHONY: prepare-infra-cluster
prepare-infra-cluster: cert-manager envoy-gateway external-dns
Expand Down
38 changes: 37 additions & 1 deletion PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ resources:
path: sigs.k8s.io/gateway-api/apis/v1
version: v1
webhooks:
validation: true
defaulting: true
validation: true
webhookVersion: v1
- domain: k8s.io
external: true
Expand Down Expand Up @@ -107,4 +107,40 @@ resources:
kind: Domain
path: go.datum.net/network-services-operator/api/v1alpha
version: v1alpha
- domain: envoyproxy.io
external: true
group: gateway
kind: BackendTrafficPolicy
path: github.com/envoyproxy/gateway/api/v1alpha1
version: v1alpha1
webhooks:
validation: true
webhookVersion: v1
- domain: envoyproxy.io
external: true
group: gateway
kind: SecurityPolicy
path: github.com/envoyproxy/gateway/api/v1alpha1
version: v1alpha1
webhooks:
validation: true
webhookVersion: v1
- domain: envoyproxy.io
external: true
group: gateway
kind: HTTPRouteFilter
path: github.com/envoyproxy/gateway/api/v1alpha1
version: v1alpha1
webhooks:
validation: true
webhookVersion: v1
- domain: envoyproxy.io
external: true
group: gateway
kind: Backend
path: github.com/envoyproxy/gateway/api/v1alpha1
version: v1alpha1
webhooks:
validation: true
webhookVersion: v1
version: "3"
32 changes: 32 additions & 0 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
// to ensure that exec-entrypoint and run can make use of them.
_ "k8s.io/client-go/plugin/pkg/client/auth"

envoygatewayv1alpha1 "github.com/envoyproxy/gateway/api/v1alpha1"
multiclusterproviders "go.miloapis.com/milo/pkg/multicluster-runtime"
milomulticluster "go.miloapis.com/milo/pkg/multicluster-runtime/milo"
"golang.org/x/sync/errgroup"
Expand Down Expand Up @@ -38,6 +39,7 @@ import (
networkingwebhook "go.datum.net/network-services-operator/internal/webhook"
networkinggatewayv1webhooks "go.datum.net/network-services-operator/internal/webhook/v1"
networkingv1alphawebhooks "go.datum.net/network-services-operator/internal/webhook/v1alpha"
webhookgatewayv1alpha1 "go.datum.net/network-services-operator/internal/webhook/v1alpha1"
// +kubebuilder:scaffold:imports
)

Expand All @@ -56,9 +58,11 @@ func init() {
utilruntime.Must(gatewayv1.Install(scheme))
utilruntime.Must(gatewayv1alpha2.Install(scheme))
utilruntime.Must(gatewayv1alpha3.Install(scheme))
utilruntime.Must(envoygatewayv1alpha1.AddToScheme(scheme))
// +kubebuilder:scaffold:scheme
}

// nolint:gocyclo
func main() {
var enableLeaderElection bool
var leaderElectionNamespace string
Expand Down Expand Up @@ -226,6 +230,14 @@ func main() {
os.Exit(1)
}

if err := (&controller.GatewayResourceReplicatorReconciler{
Config: serverConfig,
DownstreamCluster: downstreamCluster,
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "GatewayResourceReplicator")
os.Exit(1)
}

if err := (&controller.DomainReconciler{
Config: serverConfig,
}).SetupWithManager(mgr); err != nil {
Expand Down Expand Up @@ -253,6 +265,26 @@ func main() {
os.Exit(1)
}

if err = webhookgatewayv1alpha1.SetupBackendTrafficPolicyWebhookWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create webhook", "webhook", "BackendTrafficPolicy")
os.Exit(1)
}

if err = webhookgatewayv1alpha1.SetupSecurityPolicyWebhookWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create webhook", "webhook", "SecurityPolicy")
os.Exit(1)
}

if err = webhookgatewayv1alpha1.SetupHTTPRouteFilterWebhookWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create webhook", "webhook", "HTTPRouteFilter")
os.Exit(1)
}

if err = webhookgatewayv1alpha1.SetupBackendWebhookWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create webhook", "webhook", "Backend")
os.Exit(1)
}

// +kubebuilder:scaffold:builder

if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
Expand Down
24 changes: 24 additions & 0 deletions config/dev/webhook_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,30 @@ patch: |-
path: /webhooks/2/clientConfig/url
- op: remove
path: /webhooks/2/clientConfig/service

- op: move
from: /webhooks/3/clientConfig/service/path
path: /webhooks/3/clientConfig/url
- op: remove
path: /webhooks/3/clientConfig/service

- op: move
from: /webhooks/4/clientConfig/service/path
path: /webhooks/4/clientConfig/url
- op: remove
path: /webhooks/4/clientConfig/service

- op: move
from: /webhooks/5/clientConfig/service/path
path: /webhooks/5/clientConfig/url
- op: remove
path: /webhooks/5/clientConfig/service

- op: move
from: /webhooks/6/clientConfig/service/path
path: /webhooks/6/clientConfig/url
- op: remove
path: /webhooks/6/clientConfig/service
target:
kind: ValidatingWebhookConfiguration
---
Expand Down
9 changes: 9 additions & 0 deletions config/tools/envoy-gateway/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,12 @@ helmCharts:
releaseName: envoy-gateway
version: v1.5.0
repo: oci://docker.io/envoyproxy
valuesInline:
config:
envoyGateway:
extensionApis:
enableBackend: true
enableEnvoyPatchPolicy: true
runtimeFlags:
enabled:
- XDSNameSchemeV2
80 changes: 80 additions & 0 deletions config/webhook/manifests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,83 @@ webhooks:
resources:
- httpproxies
sideEffects: None
- admissionReviewVersions:
- v1
clientConfig:
service:
name: webhook-service
namespace: system
path: /validate-gateway-envoyproxy-io-v1alpha1-backend
failurePolicy: Fail
name: vbackend-v1alpha1.kb.io
rules:
- apiGroups:
- gateway.envoyproxy.io
apiVersions:
- v1alpha1
operations:
- CREATE
- UPDATE
resources:
- backends
sideEffects: None
- admissionReviewVersions:
- v1
clientConfig:
service:
name: webhook-service
namespace: system
path: /validate-gateway-envoyproxy-io-v1alpha1-backendtrafficpolicy
failurePolicy: Fail
name: vbackendtrafficpolicy-v1alpha1.kb.io
rules:
- apiGroups:
- gateway.envoyproxy.io
apiVersions:
- v1alpha1
operations:
- CREATE
- UPDATE
resources:
- backendtrafficpolicies
sideEffects: None
- admissionReviewVersions:
- v1
clientConfig:
service:
name: webhook-service
namespace: system
path: /validate-gateway-envoyproxy-io-v1alpha1-httproutefilter
failurePolicy: Fail
name: vhttproutefilter-v1alpha1.kb.io
rules:
- apiGroups:
- gateway.envoyproxy.io
apiVersions:
- v1alpha1
operations:
- CREATE
- UPDATE
resources:
- httproutefilters
sideEffects: None
- admissionReviewVersions:
- v1
clientConfig:
service:
name: webhook-service
namespace: system
path: /validate-gateway-envoyproxy-io-v1alpha1-securitypolicy
failurePolicy: Fail
name: vsecuritypolicy-v1alpha1.kb.io
rules:
- apiGroups:
- gateway.envoyproxy.io
apiVersions:
- v1alpha1
operations:
- CREATE
- UPDATE
resources:
- securitypolicies
sideEffects: None
73 changes: 36 additions & 37 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
module go.datum.net/network-services-operator

go 1.24.0

toolchain go1.24.2
go 1.24.7

require (
github.com/envoyproxy/gateway v1.5.1
github.com/go-logr/logr v1.4.3
github.com/google/go-cmp v0.7.0
github.com/google/uuid v1.6.0
github.com/onsi/ginkgo/v2 v2.23.4
github.com/onsi/gomega v1.37.0
github.com/stretchr/testify v1.10.0
go.miloapis.com/milo v0.1.0
golang.org/x/sync v0.15.0
golang.org/x/sync v0.16.0
google.golang.org/protobuf v1.36.6
k8s.io/api v0.33.1
k8s.io/apimachinery v0.33.2
k8s.io/client-go v0.33.1
k8s.io/api v0.33.3
k8s.io/apimachinery v0.33.3
k8s.io/client-go v0.33.3
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
sigs.k8s.io/controller-runtime v0.21.0
sigs.k8s.io/gateway-api v1.3.0
sigs.k8s.io/gateway-api v1.3.1-0.20250527223622-54df0a899c1c
sigs.k8s.io/multicluster-runtime v0.21.0-alpha.8
)

Expand All @@ -31,12 +31,11 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.21.1 // indirect
Expand All @@ -45,63 +44,63 @@ require (
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/cel-go v0.25.0 // indirect
github.com/google/cel-go v0.26.0 // indirect
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.9.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.22.0 // indirect
github.com/prometheus/client_golang v1.23.0 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.64.0 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/prometheus/common v0.65.0 // indirect
github.com/prometheus/procfs v0.17.0 // indirect
github.com/spf13/cobra v1.9.1 // indirect
github.com/spf13/pflag v1.0.7 // indirect
github.com/stoewer/go-strcase v1.3.0 // indirect
github.com/stoewer/go-strcase v1.3.1 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
go.opentelemetry.io/otel v1.37.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
go.opentelemetry.io/otel/metric v1.37.0 // indirect
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
go.opentelemetry.io/otel/trace v1.37.0 // indirect
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
golang.org/x/net v0.41.0 // indirect
golang.org/x/exp v0.0.0-20250718183923-645b1fa84792 // indirect
golang.org/x/net v0.42.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/term v0.32.0 // indirect
golang.org/x/text v0.26.0 // indirect
golang.org/x/sys v0.34.0 // indirect
golang.org/x/term v0.33.0 // indirect
golang.org/x/text v0.27.0 // indirect
golang.org/x/time v0.12.0 // indirect
golang.org/x/tools v0.33.0 // indirect
golang.org/x/tools v0.35.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250512202823-5a2f75b736a9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
google.golang.org/grpc v1.72.1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect
google.golang.org/grpc v1.74.2 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.33.1 // indirect
k8s.io/apiserver v0.33.1 // indirect
k8s.io/component-base v0.33.1 // indirect
k8s.io/apiextensions-apiserver v0.33.3 // indirect
k8s.io/apiserver v0.33.3 // indirect
k8s.io/component-base v0.33.3 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
sigs.k8s.io/yaml v1.5.0 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
)
Loading