Skip to content
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

Jump to bottom

Handling Missing Ingress Domain for Registry Operator #89

Merged
merged 9 commits into from
May 21, 2024
Merged

Handling Missing Ingress Domain for Registry Operator #89

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
448298c
add logic for handling missing ingress domain
Jdubrick Apr 30, 2024
809eb9e
use local hostname if ingress skipped
Jdubrick May 3, 2024
5db0632
update localhost values to use global var
Jdubrick May 7, 2024
04e7407
fix typo for using localhost constant
Jdubrick May 7, 2024
50997b0
remove protocol from local hostname constant
Jdubrick May 8, 2024
61ad5d9
create helper func for skipping ingress
Jdubrick May 9, 2024
cf28833
prefix http protocol to url
Jdubrick May 9, 2024
94467ca
add logic for skipping checks for missing ingress k8s cases
Jdubrick May 9, 2024
78f0c44
cherry pick remove items & block deployment if ingress unset
Jdubrick May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 8 additions & 3 deletions controllers/devfileregistry_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,14 @@ func (r *DevfileRegistryReconciler) Reconcile(ctx context.Context, req ctrl.Requ
} else {
// Create/update the ingress for the devfile registry
hostname = registry.GetDevfileRegistryIngress(devfileRegistry)
result, err = r.ensure(ctx, devfileRegistry, &networkingv1.Ingress{}, labels, hostname)
if result != nil {
return *result, err

if devfileRegistry.Spec.K8s.IngressDomain != "" {
result, err = r.ensure(ctx, devfileRegistry, &networkingv1.Ingress{}, labels, hostname)
if result != nil {
return *result, err
}
} else {
log.Info("Ingress creation skipped due to missing IngressDomain field.")
}
}

Expand Down
2 changes: 2 additions & 0 deletions pkg/registry/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@
package registry

const maxTruncLength = 63

const localHostname = "http://localhost:8080"
Jdubrick marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions pkg/registry/ingress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ func GenerateIngress(cr *registryv1alpha1.DevfileRegistry, host string, scheme *
}

func GetDevfileRegistryIngress(cr *registryv1alpha1.DevfileRegistry) string {
if cr.Spec.K8s.IngressDomain == "" {
return localHostname
}
return GetHostname(cr) + "." + cr.Spec.K8s.IngressDomain
}

Expand Down
10 changes: 10 additions & 0 deletions pkg/registry/ingress_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,16 @@ func TestGetDevfileRegistryIngress(t *testing.T) {
}},
want: "test-name-devfile-registry-test-namespace.my-domain",
},
{
name: "Case 2: Unset Ingress",
cr: registryv1alpha1.DevfileRegistry{
ObjectMeta: metav1.ObjectMeta{
Name: "test-name",
Namespace: "test-namespace",
},
},
want: localHostname,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down