Implement UI changes for the new Repos API #5186

antgamdia · 2022-08-09T17:22:26Z

Description of the change

This PR is based on the stacked and already approved incremental PRs towards a revamped UI supporting the new Repos API.

Benefits

Repos can be managed from the UI, regardless of the plugin (* Helm/Flux/Carvel for now).

Possible drawbacks

The syncpodtemplate is no longer editable using the UI. We have to analyze the impact of it and provide a way if still required. Notwithstanding, it can still be changed via values.yaml in the initialRepos value.

Applicable issues

fixes Use the new Repositories API in the UI #4764 (finally!!)

Additional information

N/A

* Delete unused urls Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Add getPluginByName to utils + imlp unit tests Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Remove unused types Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Rename IAppRepositoryFilter to IPkgRepositoryFilter Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Remove no longer used elements from AppRepoList Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Run prettier Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

* wip Revamp AppRepoForm Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Update tests Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Allow no-commented-out-tests temporarily Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix linter issue Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix linter issues Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> Conflicts: dashboard/src/shared/url.ts

* wip Revamp AppRepoForm Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Update tests Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Allow no-commented-out-tests temporarily Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix linter issue Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix linter issues Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Delete AppRepository Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix repos action Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Add remaining changes Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * wip fix some test cases Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix repos.ts test suite Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Implement PackageRepositoriesService test suite Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Add plural names. Add packageFormat in repo list Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Add AppRepoForm Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix AppRepoForm test cases Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix remaining tests Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Remove no longer used urls Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Avoid setting auth values if undefined Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix e2e tests Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Allow setting pullSecret in the UI. Improve CA input/secret selector Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Disable e2e test 03 Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix linter issue Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix test case Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix test 03 Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Run prettier Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Minor file renames from AppRepo to PkgRepo (#4955) * Minor renames Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Rename files from AppRepo to PkgRepo Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix test cases Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Comment-out e2e test Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Extract regex to a const Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Add some suggestions from code review Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix type issues in actons. Perform renames Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Rename kubeappsNamespace to globalReposNamespace Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Remove validation action. Fix action tests Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Return summaries in action to avoid full reload Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Add test case for sorting when adding repo Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Disable unsupported auth methods Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Suggest pull secrets if usign docker creds Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Remove ad-hoc helm client Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Extract customDetails encoding to a fn Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Delete leftover Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Remove apprepo management from Kubeops (#5026) * Remove unused logic from kubeops Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Remove old kubeops endpoint from api docs Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Remove unused kubeops args Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Address PR's comments Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Tidy up the `/pkg` folder (#5027) * Remove pkg/handlerutil Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Remove unused code from pkg/agent Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Move pkg/agent to plugins/pkg/agent Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Add dockerjson auth type as supported to flux plg Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * cast request.customDetails to RepositoryCustomDetails Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Avoid seding mixed user/kubeapps mgn secrets Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Modify toggle msgs Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Improve secret info msg Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

* Update custom detail name with a consistent naming format Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Add generated code Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Perform renames in the code Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

* clean up unused fields and actions from repos state Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Rename some state fields Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Rename actions Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> Conflicts: cmd/kubeops/internal/response/response_test.go

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

* Add kapp's customdetails handling Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Improvements on repo list page Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Skip building customdetail if any Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Avoid infinite loading after editing a repo Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Remove leftover Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix type issue Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Merge branch '4764-pkg-repos-ui' into minor-reposUI-fixes Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix minor rename Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Add test case Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> Conflicts: cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/repositories.go dashboard/src/components/AppView/AppView.tsx

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

* Add imagePullSecrets option to repos API Signed-off-by: Rafa Castelblanque <rcastelblanq@vmware.com> * Regenerated code after merge from main Signed-off-by: Rafa Castelblanque <rcastelblanq@vmware.com> * Rename `customDetails` to `customDetail` Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix not found error handling. Organize imports Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Add pullSecret management in repos UI Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Comment out lines Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Move secret check just when required Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Avoid passing unnecesary properties in the custom details Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix e2e tese Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix merge conflicts Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Run prettier Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix merge issue Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Run prettier Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix typo Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> * Fix no-case-declarations eslint issue Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> Co-authored-by: Rafa Castelblanque <rcastelblanq@vmware.com>

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> Conflicts: cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/repositories_auth.go cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/repositories_test.go dashboard/src/shared/utils.ts integration/tests/main/03-create-private-package-repository.spec.js integration/tests/main/10-deploy-package-with-private-image.spec.js

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> Conflicts: dashboard/src/components/Config/AppRepoList/AppRepoList.tsx dashboard/src/components/Config/PkgRepoList/PkgRepoList.tsx

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> Conflicts: dashboard/public/openapi.yaml

netlify · 2022-08-09T17:22:32Z

✅ Deploy Preview for kubeapps-dev ready!

Name	Link
🔨 Latest commit	`79c0be1`
🔍 Latest deploy log	https://app.netlify.com/sites/kubeapps-dev/deploys/62f39ab86337540009c7f474
😎 Deploy Preview	https://deploy-preview-5186--kubeapps-dev.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

castelblanque · 2022-08-10T06:34:58Z

it can still be changed via values.yaml in the initialRepos value.

Great! syncpodtemplate can also be changed through CLI directly to the AppRepository CRD after installation of Kubeapps.

castelblanque · 2022-08-10T06:51:26Z

cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/repositories_auth.go

 	var appRepoAuth = &apprepov1alpha1.AppRepositoryAuth{}

 	if tlsConfig != nil {
+		if secret == nil {
+			return nil, status.Errorf(codes.InvalidArgument, "Secret is missing")


Suggested change

return nil, status.Errorf(codes.InvalidArgument, "Secret is missing")

return nil, status.Errorf(codes.InvalidArgument, "Secret for AppRepository auth is missing")

castelblanque · 2022-08-10T06:51:38Z

cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/repositories_auth.go

@@ -165,6 +169,9 @@ func newAppRepositoryAuth(secret *k8scorev1.Secret,
 		case corev1.PackageRepositoryAuth_PACKAGE_REPOSITORY_AUTH_TYPE_BASIC_AUTH,
 			corev1.PackageRepositoryAuth_PACKAGE_REPOSITORY_AUTH_TYPE_BEARER,
 			corev1.PackageRepositoryAuth_PACKAGE_REPOSITORY_AUTH_TYPE_AUTHORIZATION_HEADER:
+			if secret == nil {
+				return nil, status.Errorf(codes.InvalidArgument, "Secret is missing")


Suggested change

return nil, status.Errorf(codes.InvalidArgument, "Secret is missing")

return nil, status.Errorf(codes.InvalidArgument, "Secret for AppRepository auth is missing")

castelblanque · 2022-08-10T06:51:52Z

cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/repositories_auth.go

@@ -178,6 +185,9 @@ func newAppRepositoryAuth(secret *k8scorev1.Secret,
 				return nil, status.Errorf(codes.InvalidArgument, "Authentication header is missing")
 			}
 		case corev1.PackageRepositoryAuth_PACKAGE_REPOSITORY_AUTH_TYPE_DOCKER_CONFIG_JSON:
+			if secret == nil {
+				return nil, status.Errorf(codes.InvalidArgument, "Secret is missing")


Suggested change

return nil, status.Errorf(codes.InvalidArgument, "Secret is missing")

return nil, status.Errorf(codes.InvalidArgument, "Secret for AppRepository auth is missing")

castelblanque · 2022-08-10T07:12:55Z

dashboard/src/shared/utils.ts

@@ -153,3 +181,34 @@ export function getAppStatusLabel(
  const jsonReason = installedPackageStatus_StatusReasonToJSON(statusReason);
  return jsonReason.replace("STATUS_REASON_", "").toLowerCase();
 }
+
+export function getSupportedAuthMethods(


Suggested change

export function getSupportedAuthMethods(

export function getSupportedPackageRepositoryAuthTypes(

Just being a nitpicker here 😄

castelblanque

LGTM, thanks.

This is a great feature that we are adding to Kubeapps, congrats!!!

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

antgamdia · 2022-08-10T13:16:55Z

merging 🤞

antgamdia and others added 26 commits June 20, 2022 11:14

Merge branch 'main' into 4764-pkg-repos-ui

302f0e1

Merge branch 'main' into 4764-pkg-repos-ui

14b001b

Merge branch 'main' into 4764-pkg-repos-ui

427a847

Merge branch 'main' into 4764-pkg-repos-ui

fc0e057

Merge branch 'main'

208573a

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> Conflicts: dashboard/src/shared/url.ts

Merge branch 'main' into 4764-pkg-repos-ui

c3a8ef9

Merge branch 'main' into 4764-pkg-repos-ui

d3cee96

Merge branch 'main'

f2edf7f

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> Conflicts: cmd/kubeops/internal/response/response_test.go

Rename customDetails to customDetail (#5106)

c7acc2a

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

Merge branch 'main'

22e5bff

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> Conflicts: cmd/kubeapps-apis/plugins/helm/packages/v1alpha1/repositories.go dashboard/src/components/AppView/AppView.tsx

Fix copyright header. Ignore webmanifest files.

aa2207e

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

Fix test case

db8481f

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

Merge branch 'main' into 4764-pkg-repos-ui

9ad9d5d

Merge branch 'main'

3310bc5

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> Conflicts: dashboard/src/components/Config/AppRepoList/AppRepoList.tsx dashboard/src/components/Config/PkgRepoList/PkgRepoList.tsx

Fix merge issue

fd0d7d5

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

Fix wrong icon path

286face

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

Enable e2e tests back (#5115)

994e84c

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

Merge branch 'main'

5b4e999

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com> Conflicts: dashboard/public/openapi.yaml

vmwclabot added the cla-not-required label Aug 9, 2022

castelblanque reviewed Aug 10, 2022

View reviewed changes

castelblanque approved these changes Aug 10, 2022

View reviewed changes

add pr review suggestions

79c0be1

Signed-off-by: Antonio Gamez Diaz <agamez@vmware.com>

antgamdia merged commit 8c8747c into main Aug 10, 2022

antgamdia deleted the 4764-pkg-repos-ui branch August 10, 2022 13:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement UI changes for the new Repos API #5186

Implement UI changes for the new Repos API #5186

antgamdia commented Aug 9, 2022

netlify bot commented Aug 9, 2022 •

edited

castelblanque commented Aug 10, 2022

castelblanque Aug 10, 2022

castelblanque Aug 10, 2022

castelblanque Aug 10, 2022

castelblanque Aug 10, 2022

castelblanque left a comment

antgamdia commented Aug 10, 2022

	return nil, status.Errorf(codes.InvalidArgument, "Secret is missing")
	return nil, status.Errorf(codes.InvalidArgument, "Secret for AppRepository auth is missing")

	export function getSupportedAuthMethods(
	export function getSupportedPackageRepositoryAuthTypes(

Implement UI changes for the new Repos API #5186

Implement UI changes for the new Repos API #5186

Conversation

antgamdia commented Aug 9, 2022

Description of the change

Benefits

Possible drawbacks

Applicable issues

Additional information

netlify bot commented Aug 9, 2022 • edited

✅ Deploy Preview for kubeapps-dev ready!

castelblanque commented Aug 10, 2022

castelblanque Aug 10, 2022

Choose a reason for hiding this comment

castelblanque Aug 10, 2022

Choose a reason for hiding this comment

castelblanque Aug 10, 2022

Choose a reason for hiding this comment

castelblanque Aug 10, 2022

Choose a reason for hiding this comment

castelblanque left a comment

Choose a reason for hiding this comment

antgamdia commented Aug 10, 2022

netlify bot commented Aug 9, 2022 •

edited