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

Fix registry viewer host alias resolution #51

Merged
merged 6 commits into from
Sep 22, 2023
Merged

Fix registry viewer host alias resolution #51

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
912907d
Fix registry viewer host alias resolution
kim-tsao Sep 20, 2023
a16697f
Add a fake kubeconfig to fix CI tests
kim-tsao Sep 20, 2023
fdb2b9e
fix path
kim-tsao Sep 20, 2023
db468c1
Undo controller test changes
kim-tsao Sep 21, 2023
12e1a41
update integration tests
kim-tsao Sep 21, 2023
20eeb41
Address review comments
kim-tsao Sep 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
Prev Previous commit
Address review comments 
Signed-off-by: Kim Tsao <ktsao@redhat.com>
  • Loading branch information
@kim-tsao
kim-tsao committed Sep 22, 2023
commit 20eeb418466fc8268b927b1a266c43dcda578188
13 changes: 0 additions & 13 deletions controllers/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,16 +219,3 @@ func (r *DevfileRegistryReconciler) deleteOldPVCIfNeeded(ctx context.Context, cr
}
return nil
}

/*func (r *DevfileRegistryReconciler) updateConfigMap(ctx context.Context, cr *registryv1alpha1.DevfileRegistry, configMap *corev1.ConfigMap) error {

viewerEnvfile := fmt.Sprintf(`
NEXT_PUBLIC_ANALYTICS_WRITE_KEY=%s
DEVFILE_REGISTRIES=[{"name":"%s","url":"http://localhost:8080","fqdn":"%s"}]`,
cr.Spec.Telemetry.RegistryViewerWriteKey, cr.ObjectMeta.Name, cr.Status.URL)

configMap.Data[".env.registry-viewer"] = viewerEnvfile

return r.Update(ctx, configMap)

}*/
1 change: 1 addition & 0 deletions tests/integration/pkg/tests/devfileregistry_tests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ func waitForPodsToFullyStartInUIMode(label string) {
Expect(err).NotTo(HaveOccurred())
}

// validateEnvVariables validates the set environment variables of the devfile registry containers
func validateEnvVariables(label, registryName, registryURL, viewerWriteKey, telemetryKey string) {
//Determine if the viewer pod contains the resolved DevfileRegistryURL
newPodList, err := K8sClient.ListPods(config.Namespace, label)
Expand Down