Skip to content

EPMDEDP-17139: feat: add Envoy Gateway HTTPRoute support for GitServer webhook #291

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
SergK merged 1 commit into from
Jul 7, 2026
Merged

EPMDEDP-17139: feat: add Envoy Gateway HTTPRoute support for GitServer webhook #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
ctrlwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"

cdPipeApi "github.com/epam/edp-cd-pipeline-operator/v2/api/v1"
buildInfo "github.com/epam/edp-common/pkg/config"
Expand Down Expand Up @@ -207,6 +208,7 @@ func main() {
utilruntime.Must(cdPipeApi.AddToScheme(scheme))
utilruntime.Must(networkingV1.AddToScheme(scheme))
utilruntime.Must(routeApi.AddToScheme(scheme))
utilruntime.Must(gatewayv1.Install(scheme))
utilruntime.Must(tektonTriggersApi.AddToScheme(scheme))
utilruntime.Must(tektonpipelineApi.AddToScheme(scheme))

Expand Down
9 changes: 9 additions & 0 deletions config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,15 @@ rules:
- patch
- update
- watch
- apiGroups:
- gateway.networking.k8s.io
resources:
- httproutes
verbs:
- create
- get
- list
- watch
- apiGroups:
- networking.k8s.io
resources:
Expand Down
31 changes: 28 additions & 3 deletions controllers/codebase/service/chain/put_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
networkingV1 "k8s.io/api/networking/v1"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"

codebaseApi "github.com/epam/edp-codebase-operator/v2/api/v1"
"github.com/epam/edp-codebase-operator/v2/controllers/gitserver"
Expand Down Expand Up @@ -160,11 +161,15 @@ func (s *PutWebHook) getWebHookUrl(ctx context.Context, gitServer *codebaseApi.G
return gitServer.Spec.WebhookUrl, nil
}

if platform.IsK8S() {
return s.getWebhookIngressUrl(ctx, gitServer.Name, gitServer.Namespace)
if !platform.IsK8S() {
return s.getWebhookRouteUrl(ctx, gitServer.Name, gitServer.Namespace)
}

return s.getWebhookRouteUrl(ctx, gitServer.Name, gitServer.Namespace)
if platform.IsEnvoy() {
return s.getWebhookHTTPRouteUrl(ctx, gitServer.Name, gitServer.Namespace)
}

return s.getWebhookIngressUrl(ctx, gitServer.Name, gitServer.Namespace)
}

func (*PutWebHook) processCodebaseError(codebase *codebaseApi.Codebase, err error) error {
Expand Down Expand Up @@ -193,6 +198,26 @@ func (s *PutWebHook) getWebhookIngressUrl(ctx context.Context, gitServerName, na
return util.GetHostWithProtocol(ingress.Spec.Rules[0].Host), nil
}

func (s *PutWebHook) getWebhookHTTPRouteUrl(ctx context.Context, gitServerName, namespace string) (string, error) {
route := &gatewayv1.HTTPRoute{}
if err := s.client.Get(
ctx,
client.ObjectKey{
Name: gitserver.GenerateIngressName(gitServerName),
Namespace: namespace,
},
route,
); err != nil {
return "", fmt.Errorf("failed to get webhook HTTPRoute: %w", err)
}

if len(route.Spec.Hostnames) == 0 {
return "", fmt.Errorf("HTTPRoute %s doesn't have hostnames", route.Name)
}

return util.GetHostWithProtocol(string(route.Spec.Hostnames[0])), nil
}

func (s *PutWebHook) getWebhookRouteUrl(ctx context.Context, gitServerName, namespace string) (string, error) {
route := &routeApi.Route{}
if err := s.client.Get(
Expand Down
194 changes: 194 additions & 0 deletions controllers/codebase/service/chain/put_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"

codebaseApi "github.com/epam/edp-codebase-operator/v2/api/v1"
"github.com/epam/edp-codebase-operator/v2/controllers/gitserver"
Expand All @@ -42,6 +43,7 @@ func TestPutWebHook_ServeRequest(t *testing.T) {
require.NoError(t, coreV1.AddToScheme(schema))
require.NoError(t, networkingV1.AddToScheme(schema))
require.NoError(t, routeApi.AddToScheme(schema))
require.NoError(t, gatewayv1.Install(schema))

gitURL := "test-owner/test-repo"
fakeUrlRegexp := regexp.MustCompile(`.*`)
Expand Down Expand Up @@ -247,6 +249,66 @@ func TestPutWebHook_ServeRequest(t *testing.T) {
},
wantErr: require.NoError,
},
{
name: "success gitlab with envoy httproute",
codebase: &codebaseApi.Codebase{
ObjectMeta: metaV1.ObjectMeta{
Namespace: namespace,
Name: "test-codebase",
ResourceVersion: "1",
},
Spec: codebaseApi.CodebaseSpec{
GitServer: "test-git-server",
GitUrlPath: gitURL,
CiTool: util.CITekton,
},
},
prepare: func(t *testing.T) {
t.Setenv(platform.TypeEnv, platform.K8S)
t.Setenv(platform.IngressControllerEnv, platform.IngressControllerEnvoy)
},
k8sObjects: []client.Object{
&codebaseApi.Codebase{
ObjectMeta: metaV1.ObjectMeta{
Namespace: namespace,
Name: "test-codebase",
ResourceVersion: "1",
},
},
&codebaseApi.GitServer{
ObjectMeta: metaV1.ObjectMeta{
Namespace: namespace,
Name: "test-git-server",
},
Spec: codebaseApi.GitServerSpec{
GitHost: "fake.gitlab.com",
GitUser: "git",
HttpsPort: 443,
NameSshKeySecret: "test-secret",
GitProvider: codebaseApi.GitProviderGitlab,
},
},
&coreV1.Secret{
ObjectMeta: metaV1.ObjectMeta{
Namespace: namespace,
Name: "test-secret",
},
Data: map[string][]byte{
util.GitServerSecretTokenField: []byte("test-token"),
util.GitServerSecretWebhookSecretField: []byte("test-webhook-secret"),
},
},
fakeHTTPRoute(gitserver.GenerateIngressName("test-git-server"), "fake.gitlab.com"),
},
responder: func(t *testing.T) {
POSTResponder := httpmock.NewStringResponder(http.StatusOK, "")
httpmock.RegisterRegexpResponder(http.MethodPost, fakeUrlRegexp, POSTResponder)

GETResponder := httpmock.NewStringResponder(http.StatusOK, "")
httpmock.RegisterRegexpResponder(http.MethodGet, fakeUrlRegexp, GETResponder)
},
wantErr: require.NoError,
},
{
name: "success github",
codebase: &codebaseApi.Codebase{
Expand Down Expand Up @@ -787,6 +849,105 @@ func TestPutWebHook_ServeRequest(t *testing.T) {
wantErr: require.Error,
errContains: "failed to get webhook ingress",
},
{
name: "failed to get getWebHookUrl - no hostnames on httproute",
codebase: &codebaseApi.Codebase{
ObjectMeta: metaV1.ObjectMeta{
Namespace: namespace,
Name: "test-codebase",
},
Spec: codebaseApi.CodebaseSpec{
GitServer: "test-git-server",
GitUrlPath: gitURL,
CiTool: util.CITekton,
},
},
prepare: func(t *testing.T) {
t.Setenv(platform.TypeEnv, platform.K8S)
t.Setenv(platform.IngressControllerEnv, platform.IngressControllerEnvoy)
},
k8sObjects: []client.Object{
&codebaseApi.GitServer{
ObjectMeta: metaV1.ObjectMeta{
Namespace: namespace,
Name: "test-git-server",
},
Spec: codebaseApi.GitServerSpec{
GitHost: "fake.gitlab.com",
GitUser: "git",
HttpsPort: 443,
NameSshKeySecret: "test-secret",
GitProvider: codebaseApi.GitProviderGitlab,
},
},
&coreV1.Secret{
ObjectMeta: metaV1.ObjectMeta{
Namespace: namespace,
Name: "test-secret",
},
Data: map[string][]byte{
util.GitServerSecretTokenField: []byte("test-token"),
},
},
&gatewayv1.HTTPRoute{
ObjectMeta: metaV1.ObjectMeta{
Namespace: namespace,
Name: gitserver.GenerateIngressName("test-git-server"),
Labels: map[string]string{
"app.edp.epam.com/gitServer": "test-git-server",
},
},
},
},
responder: func(t *testing.T) {},
wantErr: require.Error,
errContains: "doesn't have hostnames",
},
{
name: "failed to get getWebHookUrl - no httproute",
codebase: &codebaseApi.Codebase{
ObjectMeta: metaV1.ObjectMeta{
Namespace: namespace,
Name: "test-codebase",
},
Spec: codebaseApi.CodebaseSpec{
GitServer: "test-git-server",
GitUrlPath: gitURL,
CiTool: util.CITekton,
},
},
prepare: func(t *testing.T) {
t.Setenv(platform.TypeEnv, platform.K8S)
t.Setenv(platform.IngressControllerEnv, platform.IngressControllerEnvoy)
},
k8sObjects: []client.Object{
&codebaseApi.GitServer{
ObjectMeta: metaV1.ObjectMeta{
Namespace: namespace,
Name: "test-git-server",
},
Spec: codebaseApi.GitServerSpec{
GitHost: "fake.gitlab.com",
GitUser: "git",
HttpsPort: 443,
NameSshKeySecret: "test-secret",
GitProvider: codebaseApi.GitProviderGitlab,
},
},
&coreV1.Secret{
ObjectMeta: metaV1.ObjectMeta{
Namespace: namespace,
Name: "test-secret",
},
Data: map[string][]byte{
util.GitServerSecretTokenField: []byte("test-token"),
},
},
},
responder: func(t *testing.T) {},
wantErr: require.Error,
errContains: "failed to get webhook HTTPRoute",
},
{
name: "failed to get secret - no required field",
codebase: &codebaseApi.Codebase{
Expand Down Expand Up @@ -908,6 +1069,39 @@ func TestPutWebHook_ServeRequest(t *testing.T) {
}
}

func TestPutWebHook_getWebhookHTTPRouteUrl(t *testing.T) {
schema := runtime.NewScheme()
require.NoError(t, gatewayv1.Install(schema))

host := "el-test-git-server-test-ns.example.com"

k8sClient := fake.NewClientBuilder().
WithScheme(schema).
WithObjects(fakeHTTPRoute(gitserver.GenerateIngressName("test-git-server"), host)).
Build()

s := NewPutWebHook(k8sClient, resty.New())

got, err := s.getWebhookHTTPRouteUrl(context.Background(), "test-git-server", namespace)
require.NoError(t, err)
assert.Equal(t, util.GetHostWithProtocol(host), got)
}

func fakeHTTPRoute(name, host string) *gatewayv1.HTTPRoute {
return &gatewayv1.HTTPRoute{
ObjectMeta: metaV1.ObjectMeta{
Namespace: namespace,
Name: name,
Labels: map[string]string{
"app.edp.epam.com/gitServer": "test-git-server",
},
},
Spec: gatewayv1.HTTPRouteSpec{
Hostnames: []gatewayv1.Hostname{gatewayv1.Hostname(host)},
},
}
}

func fakeIngress(name, host string) *networkingV1.Ingress {
return &networkingV1.Ingress{
ObjectMeta: metaV1.ObjectMeta{
Expand Down
Loading
Loading