Skip to content

compat with gatewayapi v1.0.0. #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 23, 2023
Merged

compat with gatewayapi v1.0.0. #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e92656
compat with gatewayapi v1.0.0.
zongzw Dec 21, 2023
a206deb
add guides for v1.0.0 deployment
zongzw Dec 22, 2023
31d2c43
update develop automation scripts for webhook.
zongzw Dec 22, 2023
b72fd98
update examples' apigroup/version to v1
zongzw Dec 22, 2023
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
17 changes: 10 additions & 7 deletions cmd/controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (
// to ensure that exec-entrypoint and run can make use of them.

"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
"gopkg.in/yaml.v3"
v1 "k8s.io/api/core/v1"
_ "k8s.io/client-go/plugin/pkg/client/auth"
Expand All @@ -42,6 +41,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/metrics/server"

"github.com/f5devcentral/bigip-kubernetes-gateway/internal/controllers"
"github.com/f5devcentral/bigip-kubernetes-gateway/internal/pkg"
Expand All @@ -51,6 +51,7 @@ import (

//+kubebuilder:scaffold:imports

gatewayapi "sigs.k8s.io/gateway-api/apis/v1"
gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
)

Expand All @@ -71,6 +72,7 @@ var (

func init() {
utilruntime.Must(clientgoscheme.AddToScheme(scheme))
utilruntime.Must(gatewayapi.AddToScheme(scheme))
utilruntime.Must(gatewayv1beta1.AddToScheme(scheme))
}

Expand Down Expand Up @@ -126,7 +128,7 @@ func main() {
ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
Scheme: scheme,
MetricsBindAddress: metricsAddr,
Metrics: server.Options{BindAddress: metricsAddr},
HealthProbeBindAddress: probeAddr,
LeaderElection: enableLeaderElection,
LeaderElectionID: "303cfed9.f5.com",
Expand All @@ -151,8 +153,9 @@ func main() {
prometheus.MustRegister(utils.FunctionDurationTimeCostTotal)
prometheus.MustRegister(f5_bigip.BIGIPiControlTimeCostCount)
prometheus.MustRegister(f5_bigip.BIGIPiControlTimeCostTotal)
mgr.AddMetricsExtraHandler("/stats/", promhttp.Handler())
mgr.AddMetricsExtraHandler("/runtime/", dumpRuntimeHandler())
// TODO: use echo
// mgr.AddMetricsExtraHandler("/stats/", promhttp.Handler())
// mgr.AddMetricsExtraHandler("/runtime/", dumpRuntimeHandler())

setupReconcilers(mgr)

Expand Down Expand Up @@ -212,17 +215,17 @@ func setupReconcilers(mgr manager.Manager) {

resources.Register(
&controllers.GatewayClassReconciler{
ObjectType: &gatewayv1beta1.GatewayClass{},
ObjectType: &gatewayapi.GatewayClass{},
Client: mgr.GetClient(),
// LogLevel: cmdflags.LogLevel,
},
&controllers.GatewayReconciler{
ObjectType: &gatewayv1beta1.Gateway{},
ObjectType: &gatewayapi.Gateway{},
Client: mgr.GetClient(),
// LogLevel: cmdflags.LogLevel,
},
&controllers.HttpRouteReconciler{
ObjectType: &gatewayv1beta1.HTTPRoute{},
ObjectType: &gatewayapi.HTTPRoute{},
Client: mgr.GetClient(),
// LogLevel: cmdflags.LogLevel,
},
Expand Down
27 changes: 16 additions & 11 deletions cmd/webhook/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ import (
// to ensure that exec-entrypoint and run can make use of them.

"github.com/google/uuid"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
_ "k8s.io/client-go/plugin/pkg/client/auth"

"k8s.io/apimachinery/pkg/runtime"
Expand All @@ -37,14 +35,16 @@ import (
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
"sigs.k8s.io/controller-runtime/pkg/webhook"

// "github.com/f5devcentral/bigip-kubernetes-gateway/internal/pkg"
"github.com/f5devcentral/bigip-kubernetes-gateway/internal/webhooks"
f5_bigip "github.com/f5devcentral/f5-bigip-rest-go/bigip"
"github.com/f5devcentral/f5-bigip-rest-go/utils"

//+kubebuilder:scaffold:imports

gatewayapi "sigs.k8s.io/gateway-api/apis/v1"
gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
)

Expand All @@ -57,6 +57,7 @@ var (

func init() {
utilruntime.Must(clientgoscheme.AddToScheme(scheme))
utilruntime.Must(gatewayapi.AddToScheme(scheme))
utilruntime.Must(gatewayv1beta1.AddToScheme(scheme))
}

Expand Down Expand Up @@ -98,11 +99,15 @@ func main() {

ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
var err error

whServer := webhook.NewServer(webhook.Options{
Port: 9443,
CertDir: cmdflags.CertDir,
})
webhooks.WebhookManager, err = ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
Scheme: scheme,
MetricsBindAddress: metricsAddr,
Port: 9443,
CertDir: cmdflags.CertDir,
WebhookServer: whServer,
Metrics: server.Options{BindAddress: metricsAddr},
HealthProbeBindAddress: probeAddr,
LeaderElection: enableLeaderElection,
LeaderElectionID: "303cfed9.f5.com",
Expand All @@ -123,11 +128,11 @@ func main() {
os.Exit(1)
}

prometheus.MustRegister(utils.FunctionDurationTimeCostCount)
prometheus.MustRegister(utils.FunctionDurationTimeCostTotal)
prometheus.MustRegister(f5_bigip.BIGIPiControlTimeCostCount)
prometheus.MustRegister(f5_bigip.BIGIPiControlTimeCostTotal)
webhooks.WebhookManager.AddMetricsExtraHandler("/stats/", promhttp.Handler())
// prometheus.MustRegister(utils.FunctionDurationTimeCostCount)
// prometheus.MustRegister(utils.FunctionDurationTimeCostTotal)
// prometheus.MustRegister(f5_bigip.BIGIPiControlTimeCostCount)
// prometheus.MustRegister(f5_bigip.BIGIPiControlTimeCostTotal)
// webhooks.WebhookManager.AddMetricsExtraHandler("/stats/", promhttp.Handler())
setupWebhooks(webhooks.WebhookManager)

if err := webhooks.WebhookManager.AddHealthzCheck("healthz", healthz.Ping); err != nil {
Expand Down
Loading