diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 410e2351e..e6639a9ad 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -59,7 +59,7 @@ representative at an online or offline event. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported to the community leaders responsible for enforcement at oss-coc@vmware.com. +reported to the community leaders responsible for enforcement. All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7cf75c4b6..34bf2842f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,10 +24,6 @@ We welcome many different types of contributions and not all of them need a pull Please familiarize yourself with the [Code of Conduct](CODE_OF_CONDUCT.md) before contributing. -## Contributor License Agreement - -Before you start working with Educates, please read our Contributor License Agreement [CLA](https://cla.vmware.com/cla/1/preview). If you wish to contribute code and you have not signed our contributor license agreement (CLA), our bot will update the issue and walk you through the process when you open your first pull request. For any questions about the CLA process, please refer to our [FAQ](https://cla.vmware.com/faq). - ## Getting started If your primary objective is to use Educates, check out the [Educates user documentation](https://docs.educates.dev/). diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 0ae6ceafb..aa07355a6 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -1,6 +1,6 @@ # Current Educates Maintainers -| Maintainer | GitHub ID | Affiliation | -|------------------|-------------------------------------------------------|------------------------------------------| -| Graham Dumpleton | [GrahamDumpleton](https://github.com/GrahamDumpleton) | [VMware](https://www.github.com/vmware/) | -| Jorge Morales | [jorgemoralespou](https://github.com/jorgemoralespou) | [VMware](https://www.github.com/vmware/) | +| Maintainer | GitHub ID | +|------------------|-------------------------------------------------------| +| Graham Dumpleton | [GrahamDumpleton](https://github.com/GrahamDumpleton) | +| Jorge Morales | [jorgemoralespou](https://github.com/jorgemoralespou) | diff --git a/README.md b/README.md index acea477fd..aaefd86f4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -[![Netlify Status](https://api.netlify.com/api/v1/badges/733ffbee-a738-432b-963c-5ef65ff16302/deploy-status)](https://app.netlify.com/sites/educates-docs/deploys) - Educates Training Platform ========================== @@ -23,7 +21,7 @@ the [Kubernetes community Slack](https://kubernetes.slack.com/). If you have found a bug in Educates or want to request a feature, you can use our [GitHub issue -tracker](https://github.com/vmware-tanzu-labs/educates-training-platform/issues). +tracker](https://github.com/educates/educates-training-platform/issues). Contributing to Educates ------------------------ diff --git a/assets-server/go.mod b/assets-server/go.mod index ccaa044f5..ba1b0c6ca 100644 --- a/assets-server/go.mod +++ b/assets-server/go.mod @@ -1,4 +1,4 @@ -module github.com/vmware-tanzu-labs/educates-training-platform/assets-server +module github.com/educates/educates-training-platform/assets-server go 1.20 diff --git a/client-programs/cmd/educates/main.go b/client-programs/cmd/educates/main.go index 1a1f91b02..dbd812e59 100644 --- a/client-programs/cmd/educates/main.go +++ b/client-programs/cmd/educates/main.go @@ -7,9 +7,9 @@ import ( "os" "strings" + "github.com/educates/educates-training-platform/client-programs/pkg/cmd" + "github.com/educates/educates-training-platform/client-programs/pkg/logger" "github.com/go-logr/logr" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cmd" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/logger" "k8s.io/klog/v2" logf "sigs.k8s.io/controller-runtime/pkg/log" ) @@ -18,7 +18,7 @@ import ( // with the actual version at build time when making a release. var projectVersion string = "develop" -var imageRepository string = "ghcr.io/vmware-tanzu-labs" +var imageRepository string = "ghcr.io/educates" // Main entrypoint for execution of Educates CLI. diff --git a/client-programs/go.mod b/client-programs/go.mod index 2b5d2c008..d83a32de9 100644 --- a/client-programs/go.mod +++ b/client-programs/go.mod @@ -1,4 +1,4 @@ -module github.com/vmware-tanzu-labs/educates-training-platform/client-programs +module github.com/educates/educates-training-platform/client-programs go 1.22.5 diff --git a/client-programs/pkg/cluster/kindcluster.go b/client-programs/pkg/cluster/kindcluster.go index 332aaf2f8..c40114959 100644 --- a/client-programs/pkg/cluster/kindcluster.go +++ b/client-programs/pkg/cluster/kindcluster.go @@ -18,8 +18,8 @@ import ( "sigs.k8s.io/kind/pkg/cluster" "sigs.k8s.io/kind/pkg/cmd" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils" + "github.com/educates/educates-training-platform/client-programs/pkg/config" + "github.com/educates/educates-training-platform/client-programs/pkg/utils" ) type KindClusterConfig struct { diff --git a/client-programs/pkg/cmd/admin_diagnostics_collect_cmd.go b/client-programs/pkg/cmd/admin_diagnostics_collect_cmd.go index 1d78f4b7e..98f202175 100644 --- a/client-programs/pkg/cmd/admin_diagnostics_collect_cmd.go +++ b/client-programs/pkg/cmd/admin_diagnostics_collect_cmd.go @@ -6,8 +6,8 @@ import ( "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/diagnostics" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/diagnostics" ) type AdminDiagnosticsCollectOptions struct { diff --git a/client-programs/pkg/cmd/admin_lookup_kubeconfig_cmd.go b/client-programs/pkg/cmd/admin_lookup_kubeconfig_cmd.go index 29a4dc69b..3f9c5eace 100644 --- a/client-programs/pkg/cmd/admin_lookup_kubeconfig_cmd.go +++ b/client-programs/pkg/cmd/admin_lookup_kubeconfig_cmd.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/client-programs/pkg/cmd/admin_platform_config_cmd.go b/client-programs/pkg/cmd/admin_platform_config_cmd.go index 448392816..71e07c4de 100644 --- a/client-programs/pkg/cmd/admin_platform_config_cmd.go +++ b/client-programs/pkg/cmd/admin_platform_config_cmd.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/installer" + "github.com/educates/educates-training-platform/client-programs/pkg/config" + "github.com/educates/educates-training-platform/client-programs/pkg/installer" ) var ( diff --git a/client-programs/pkg/cmd/admin_platform_delete_cmd.go b/client-programs/pkg/cmd/admin_platform_delete_cmd.go index 6d992e5c3..6dfdb03a3 100644 --- a/client-programs/pkg/cmd/admin_platform_delete_cmd.go +++ b/client-programs/pkg/cmd/admin_platform_delete_cmd.go @@ -6,9 +6,9 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/installer" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/config" + "github.com/educates/educates-training-platform/client-programs/pkg/installer" ) type PlatformDeleteOptions struct { diff --git a/client-programs/pkg/cmd/admin_platform_deploy_cmd.go b/client-programs/pkg/cmd/admin_platform_deploy_cmd.go index a573b2d5d..51d4bf15f 100644 --- a/client-programs/pkg/cmd/admin_platform_deploy_cmd.go +++ b/client-programs/pkg/cmd/admin_platform_deploy_cmd.go @@ -6,10 +6,10 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/installer" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/secrets" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/config" + "github.com/educates/educates-training-platform/client-programs/pkg/installer" + "github.com/educates/educates-training-platform/client-programs/pkg/secrets" ) var ( diff --git a/client-programs/pkg/cmd/admin_platform_values_cmd.go b/client-programs/pkg/cmd/admin_platform_values_cmd.go index 45559e2fc..95f57bde5 100644 --- a/client-programs/pkg/cmd/admin_platform_values_cmd.go +++ b/client-programs/pkg/cmd/admin_platform_values_cmd.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/installer" + "github.com/educates/educates-training-platform/client-programs/pkg/config" + "github.com/educates/educates-training-platform/client-programs/pkg/installer" ) var ( diff --git a/client-programs/pkg/cmd/cluster_portal_create_cmd.go b/client-programs/pkg/cmd/cluster_portal_create_cmd.go index 9494ceb28..94a43e0a8 100644 --- a/client-programs/pkg/cmd/cluster_portal_create_cmd.go +++ b/client-programs/pkg/cmd/cluster_portal_create_cmd.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/client-programs/pkg/cmd/cluster_portal_delete_cmd.go b/client-programs/pkg/cmd/cluster_portal_delete_cmd.go index fd7f70b76..dc94d06cb 100644 --- a/client-programs/pkg/cmd/cluster_portal_delete_cmd.go +++ b/client-programs/pkg/cmd/cluster_portal_delete_cmd.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/client-programs/pkg/cmd/cluster_portal_list_cmd.go b/client-programs/pkg/cmd/cluster_portal_list_cmd.go index 872dc45ee..70d777e82 100644 --- a/client-programs/pkg/cmd/cluster_portal_list_cmd.go +++ b/client-programs/pkg/cmd/cluster_portal_list_cmd.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/client-programs/pkg/cmd/cluster_portal_open_cmd.go b/client-programs/pkg/cmd/cluster_portal_open_cmd.go index a34033a6a..82b0321c0 100644 --- a/client-programs/pkg/cmd/cluster_portal_open_cmd.go +++ b/client-programs/pkg/cmd/cluster_portal_open_cmd.go @@ -12,7 +12,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/client-programs/pkg/cmd/cluster_portal_password_cmd.go b/client-programs/pkg/cmd/cluster_portal_password_cmd.go index 142ebb0b1..964627957 100644 --- a/client-programs/pkg/cmd/cluster_portal_password_cmd.go +++ b/client-programs/pkg/cmd/cluster_portal_password_cmd.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/client-programs/pkg/cmd/cluster_session_extend_cmd.go b/client-programs/pkg/cmd/cluster_session_extend_cmd.go index 337cac675..921d6da84 100644 --- a/client-programs/pkg/cmd/cluster_session_extend_cmd.go +++ b/client-programs/pkg/cmd/cluster_session_extend_cmd.go @@ -5,8 +5,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/educatesrestapi" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/educatesrestapi" ) type ClusterSessionExtendOptions struct { diff --git a/client-programs/pkg/cmd/cluster_session_list_cmd.go b/client-programs/pkg/cmd/cluster_session_list_cmd.go index e6bf8d86f..d34831446 100644 --- a/client-programs/pkg/cmd/cluster_session_list_cmd.go +++ b/client-programs/pkg/cmd/cluster_session_list_cmd.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/client-programs/pkg/cmd/cluster_session_status_cmd.go b/client-programs/pkg/cmd/cluster_session_status_cmd.go index b5a2d8a4d..29d00cd5b 100644 --- a/client-programs/pkg/cmd/cluster_session_status_cmd.go +++ b/client-programs/pkg/cmd/cluster_session_status_cmd.go @@ -5,8 +5,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/educatesrestapi" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/educatesrestapi" ) type ClusterSessionStatusOptions struct { diff --git a/client-programs/pkg/cmd/cluster_session_terminate_cmd.go b/client-programs/pkg/cmd/cluster_session_terminate_cmd.go index 7c47a8239..cb07e6fe1 100644 --- a/client-programs/pkg/cmd/cluster_session_terminate_cmd.go +++ b/client-programs/pkg/cmd/cluster_session_terminate_cmd.go @@ -5,8 +5,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/educatesrestapi" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/educatesrestapi" ) type ClusterSessionTerminateOptions struct { diff --git a/client-programs/pkg/cmd/cluster_workshop_delete_cmd.go b/client-programs/pkg/cmd/cluster_workshop_delete_cmd.go index ad14e6f3a..e2826ce27 100644 --- a/client-programs/pkg/cmd/cluster_workshop_delete_cmd.go +++ b/client-programs/pkg/cmd/cluster_workshop_delete_cmd.go @@ -6,7 +6,7 @@ import ( yttcmd "carvel.dev/ytt/pkg/cmd/template" "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/client-programs/pkg/cmd/cluster_workshop_deploy_cmd.go b/client-programs/pkg/cmd/cluster_workshop_deploy_cmd.go index 9c34f44c0..20ccb1dbe 100644 --- a/client-programs/pkg/cmd/cluster_workshop_deploy_cmd.go +++ b/client-programs/pkg/cmd/cluster_workshop_deploy_cmd.go @@ -17,7 +17,7 @@ import ( yttcmd "carvel.dev/ytt/pkg/cmd/template" "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/client-programs/pkg/cmd/cluster_workshop_list_cmd.go b/client-programs/pkg/cmd/cluster_workshop_list_cmd.go index 85c3697df..ef27bc482 100644 --- a/client-programs/pkg/cmd/cluster_workshop_list_cmd.go +++ b/client-programs/pkg/cmd/cluster_workshop_list_cmd.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/client-programs/pkg/cmd/cluster_workshop_request_cmd.go b/client-programs/pkg/cmd/cluster_workshop_request_cmd.go index 1cea635b7..38efb9d1a 100644 --- a/client-programs/pkg/cmd/cluster_workshop_request_cmd.go +++ b/client-programs/pkg/cmd/cluster_workshop_request_cmd.go @@ -12,8 +12,8 @@ import ( "github.com/joho/godotenv" "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/educatesrestapi" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/educatesrestapi" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/client-programs/pkg/cmd/cluster_workshop_serve_cmd.go b/client-programs/pkg/cmd/cluster_workshop_serve_cmd.go index 4d1c19a94..5bfdf020c 100644 --- a/client-programs/pkg/cmd/cluster_workshop_serve_cmd.go +++ b/client-programs/pkg/cmd/cluster_workshop_serve_cmd.go @@ -12,9 +12,9 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/renderer" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/renderer" + "github.com/educates/educates-training-platform/client-programs/pkg/utils" ) func calculateWorkshopRoot(path string) (string, error) { diff --git a/client-programs/pkg/cmd/cluster_workshop_update_cmd.go b/client-programs/pkg/cmd/cluster_workshop_update_cmd.go index 275bc27d4..cf6abf34d 100644 --- a/client-programs/pkg/cmd/cluster_workshop_update_cmd.go +++ b/client-programs/pkg/cmd/cluster_workshop_update_cmd.go @@ -13,7 +13,7 @@ import ( yttcmd "carvel.dev/ytt/pkg/cmd/template" "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" diff --git a/client-programs/pkg/cmd/docker_workshop_delete_cmd.go b/client-programs/pkg/cmd/docker_workshop_delete_cmd.go index 525eea383..068072b9b 100644 --- a/client-programs/pkg/cmd/docker_workshop_delete_cmd.go +++ b/client-programs/pkg/cmd/docker_workshop_delete_cmd.go @@ -12,7 +12,7 @@ import ( "github.com/docker/docker/client" "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils" + "github.com/educates/educates-training-platform/client-programs/pkg/utils" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/client-programs/pkg/cmd/docker_workshop_deploy_cmd.go b/client-programs/pkg/cmd/docker_workshop_deploy_cmd.go index fdbcd6149..8323a15ba 100644 --- a/client-programs/pkg/cmd/docker_workshop_deploy_cmd.go +++ b/client-programs/pkg/cmd/docker_workshop_deploy_cmd.go @@ -21,7 +21,7 @@ import ( "github.com/docker/docker/client" "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils" + "github.com/educates/educates-training-platform/client-programs/pkg/utils" "golang.org/x/exp/slices" "gopkg.in/yaml.v2" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/client-programs/pkg/cmd/local_cluster_create_cmd.go b/client-programs/pkg/cmd/local_cluster_create_cmd.go index f788f1b28..5b78ab8ff 100644 --- a/client-programs/pkg/cmd/local_cluster_create_cmd.go +++ b/client-programs/pkg/cmd/local_cluster_create_cmd.go @@ -14,11 +14,11 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/installer" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/registry" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/secrets" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/config" + "github.com/educates/educates-training-platform/client-programs/pkg/installer" + "github.com/educates/educates-training-platform/client-programs/pkg/registry" + "github.com/educates/educates-training-platform/client-programs/pkg/secrets" ) var ( diff --git a/client-programs/pkg/cmd/local_cluster_delete_cmd.go b/client-programs/pkg/cmd/local_cluster_delete_cmd.go index 638840c41..afae80c12 100644 --- a/client-programs/pkg/cmd/local_cluster_delete_cmd.go +++ b/client-programs/pkg/cmd/local_cluster_delete_cmd.go @@ -3,9 +3,9 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/registry" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/resolver" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/registry" + "github.com/educates/educates-training-platform/client-programs/pkg/resolver" ) type LocalClusterDeleteOptions struct { diff --git a/client-programs/pkg/cmd/local_cluster_start_cmd.go b/client-programs/pkg/cmd/local_cluster_start_cmd.go index fc605ec1a..c7f7a2ac6 100644 --- a/client-programs/pkg/cmd/local_cluster_start_cmd.go +++ b/client-programs/pkg/cmd/local_cluster_start_cmd.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" ) func (p *ProjectInfo) NewLocalClusterStartCmd() *cobra.Command { diff --git a/client-programs/pkg/cmd/local_cluster_status_cmd.go b/client-programs/pkg/cmd/local_cluster_status_cmd.go index 70d15c5de..912edec6a 100644 --- a/client-programs/pkg/cmd/local_cluster_status_cmd.go +++ b/client-programs/pkg/cmd/local_cluster_status_cmd.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" ) func (p *ProjectInfo) NewLocalClusterStatusCmd() *cobra.Command { diff --git a/client-programs/pkg/cmd/local_cluster_stop_cmd.go b/client-programs/pkg/cmd/local_cluster_stop_cmd.go index 9d7d0ff19..c7685dc0b 100644 --- a/client-programs/pkg/cmd/local_cluster_stop_cmd.go +++ b/client-programs/pkg/cmd/local_cluster_stop_cmd.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" ) func (p *ProjectInfo) NewLocalClusterStopCmd() *cobra.Command { diff --git a/client-programs/pkg/cmd/local_config_edit_cmd.go b/client-programs/pkg/cmd/local_config_edit_cmd.go index 2cf8ce5fe..2b76ce1b6 100644 --- a/client-programs/pkg/cmd/local_config_edit_cmd.go +++ b/client-programs/pkg/cmd/local_config_edit_cmd.go @@ -8,8 +8,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils" + "github.com/educates/educates-training-platform/client-programs/pkg/config" + "github.com/educates/educates-training-platform/client-programs/pkg/utils" ) func (p *ProjectInfo) NewLocalConfigEditCmd() *cobra.Command { diff --git a/client-programs/pkg/cmd/local_config_reset_cmd.go b/client-programs/pkg/cmd/local_config_reset_cmd.go index 05a7d801a..450b5ef8e 100644 --- a/client-programs/pkg/cmd/local_config_reset_cmd.go +++ b/client-programs/pkg/cmd/local_config_reset_cmd.go @@ -5,7 +5,7 @@ import ( "path" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils" + "github.com/educates/educates-training-platform/client-programs/pkg/utils" ) func (p *ProjectInfo) NewLocalConfigResetCmd() *cobra.Command { diff --git a/client-programs/pkg/cmd/local_config_view_cmd.go b/client-programs/pkg/cmd/local_config_view_cmd.go index ab062c781..cbdb22240 100644 --- a/client-programs/pkg/cmd/local_config_view_cmd.go +++ b/client-programs/pkg/cmd/local_config_view_cmd.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config" + "github.com/educates/educates-training-platform/client-programs/pkg/config" "gopkg.in/yaml.v2" ) diff --git a/client-programs/pkg/cmd/local_registry_delete_cmd.go b/client-programs/pkg/cmd/local_registry_delete_cmd.go index 93411a63e..36f7e04c2 100644 --- a/client-programs/pkg/cmd/local_registry_delete_cmd.go +++ b/client-programs/pkg/cmd/local_registry_delete_cmd.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/registry" + "github.com/educates/educates-training-platform/client-programs/pkg/registry" ) func (p *ProjectInfo) NewLocalRegistryDeleteCmd() *cobra.Command { diff --git a/client-programs/pkg/cmd/local_registry_deploy_cmd.go b/client-programs/pkg/cmd/local_registry_deploy_cmd.go index 8af32ecea..d49f7c095 100644 --- a/client-programs/pkg/cmd/local_registry_deploy_cmd.go +++ b/client-programs/pkg/cmd/local_registry_deploy_cmd.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/registry" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/registry" ) type LocalRegistryDeployOptions struct { diff --git a/client-programs/pkg/cmd/local_registry_prune_cmd.go b/client-programs/pkg/cmd/local_registry_prune_cmd.go index b152916bc..3becc460c 100644 --- a/client-programs/pkg/cmd/local_registry_prune_cmd.go +++ b/client-programs/pkg/cmd/local_registry_prune_cmd.go @@ -4,7 +4,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/registry" + "github.com/educates/educates-training-platform/client-programs/pkg/registry" ) type LocalRegistryPruneOptions struct { diff --git a/client-programs/pkg/cmd/local_resolver_delete_cmd.go b/client-programs/pkg/cmd/local_resolver_delete_cmd.go index 0d5393009..ac00c1d37 100644 --- a/client-programs/pkg/cmd/local_resolver_delete_cmd.go +++ b/client-programs/pkg/cmd/local_resolver_delete_cmd.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/resolver" + "github.com/educates/educates-training-platform/client-programs/pkg/resolver" ) func (p *ProjectInfo) NewLocalResolverDeleteCmd() *cobra.Command { diff --git a/client-programs/pkg/cmd/local_resolver_deploy_cmd.go b/client-programs/pkg/cmd/local_resolver_deploy_cmd.go index f3812137a..aaf643e7b 100644 --- a/client-programs/pkg/cmd/local_resolver_deploy_cmd.go +++ b/client-programs/pkg/cmd/local_resolver_deploy_cmd.go @@ -3,8 +3,8 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/resolver" + "github.com/educates/educates-training-platform/client-programs/pkg/config" + "github.com/educates/educates-training-platform/client-programs/pkg/resolver" ) type LocalResolverDeployOptions struct { diff --git a/client-programs/pkg/cmd/local_secrets_add_cmd.go b/client-programs/pkg/cmd/local_secrets_add_cmd.go index 59b1019d4..eadd56184 100644 --- a/client-programs/pkg/cmd/local_secrets_add_cmd.go +++ b/client-programs/pkg/cmd/local_secrets_add_cmd.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils" + "github.com/educates/educates-training-platform/client-programs/pkg/utils" apiv1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubectl/pkg/util/templates" diff --git a/client-programs/pkg/cmd/local_secrets_export_cmd.go b/client-programs/pkg/cmd/local_secrets_export_cmd.go index 4694295c1..a6f237265 100644 --- a/client-programs/pkg/cmd/local_secrets_export_cmd.go +++ b/client-programs/pkg/cmd/local_secrets_export_cmd.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils" + "github.com/educates/educates-training-platform/client-programs/pkg/utils" ) func (p *ProjectInfo) NewLocalSecretsExportCmd() *cobra.Command { diff --git a/client-programs/pkg/cmd/local_secrets_import_cmd.go b/client-programs/pkg/cmd/local_secrets_import_cmd.go index 68c67ad18..e42a0d4b6 100644 --- a/client-programs/pkg/cmd/local_secrets_import_cmd.go +++ b/client-programs/pkg/cmd/local_secrets_import_cmd.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils" + "github.com/educates/educates-training-platform/client-programs/pkg/utils" apiv1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" diff --git a/client-programs/pkg/cmd/local_secrets_list_cmd.go b/client-programs/pkg/cmd/local_secrets_list_cmd.go index 0cf9b4ebd..f910ebe25 100644 --- a/client-programs/pkg/cmd/local_secrets_list_cmd.go +++ b/client-programs/pkg/cmd/local_secrets_list_cmd.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils" + "github.com/educates/educates-training-platform/client-programs/pkg/utils" ) func (p *ProjectInfo) NewLocalSecretsListCmd() *cobra.Command { diff --git a/client-programs/pkg/cmd/local_secrets_remove_cmd.go b/client-programs/pkg/cmd/local_secrets_remove_cmd.go index dfff72c64..b0953eed8 100644 --- a/client-programs/pkg/cmd/local_secrets_remove_cmd.go +++ b/client-programs/pkg/cmd/local_secrets_remove_cmd.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils" + "github.com/educates/educates-training-platform/client-programs/pkg/utils" ) func (p *ProjectInfo) NewLocalSecretsRemoveCmd() *cobra.Command { diff --git a/client-programs/pkg/cmd/local_secrets_sync_cmd.go b/client-programs/pkg/cmd/local_secrets_sync_cmd.go index 09a332c06..2151e0fcf 100644 --- a/client-programs/pkg/cmd/local_secrets_sync_cmd.go +++ b/client-programs/pkg/cmd/local_secrets_sync_cmd.go @@ -3,8 +3,8 @@ package cmd import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/secrets" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/secrets" ) type LocalSecretsSyncOptions struct { diff --git a/client-programs/pkg/cmd/template_list_cmd.go b/client-programs/pkg/cmd/template_list_cmd.go index e19ff2cef..906916b49 100644 --- a/client-programs/pkg/cmd/template_list_cmd.go +++ b/client-programs/pkg/cmd/template_list_cmd.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/templates" + "github.com/educates/educates-training-platform/client-programs/pkg/templates" ) func (p *ProjectInfo) NewTemplateListCmd() *cobra.Command { diff --git a/client-programs/pkg/cmd/workshop_new_cmd.go b/client-programs/pkg/cmd/workshop_new_cmd.go index 0f3d68b54..bb8e52238 100644 --- a/client-programs/pkg/cmd/workshop_new_cmd.go +++ b/client-programs/pkg/cmd/workshop_new_cmd.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/templates" + "github.com/educates/educates-training-platform/client-programs/pkg/templates" ) type WorkshopNewOptions struct { diff --git a/client-programs/pkg/config/installationconfig.go b/client-programs/pkg/config/installationconfig.go index fc66b4cac..d94614d86 100644 --- a/client-programs/pkg/config/installationconfig.go +++ b/client-programs/pkg/config/installationconfig.go @@ -5,8 +5,8 @@ import ( "path" "github.com/pkg/errors" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/secrets" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils" + "github.com/educates/educates-training-platform/client-programs/pkg/secrets" + "github.com/educates/educates-training-platform/client-programs/pkg/utils" "gopkg.in/yaml.v2" ) diff --git a/client-programs/pkg/diagnostics/diagnostics.go b/client-programs/pkg/diagnostics/diagnostics.go index 4d533be85..b17d3fe4d 100644 --- a/client-programs/pkg/diagnostics/diagnostics.go +++ b/client-programs/pkg/diagnostics/diagnostics.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" ) type ClusterDiagnostics struct { diff --git a/client-programs/pkg/diagnostics/fetcher.go b/client-programs/pkg/diagnostics/fetcher.go index 76b766f53..11c424577 100644 --- a/client-programs/pkg/diagnostics/fetcher.go +++ b/client-programs/pkg/diagnostics/fetcher.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/pkg/errors" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/educatesrestapi" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/educatesrestapi" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/client-programs/pkg/educatesrestapi/catalog.go b/client-programs/pkg/educatesrestapi/catalog.go index 3686649e3..745b3bd85 100644 --- a/client-programs/pkg/educatesrestapi/catalog.go +++ b/client-programs/pkg/educatesrestapi/catalog.go @@ -13,7 +13,7 @@ import ( "time" "github.com/pkg/errors" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/client-programs/pkg/installer/installer.go b/client-programs/pkg/installer/installer.go index 9dd89688d..0a36071fe 100644 --- a/client-programs/pkg/installer/installer.go +++ b/client-programs/pkg/installer/installer.go @@ -7,10 +7,10 @@ import ( "path/filepath" "time" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/logger" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/config" + "github.com/educates/educates-training-platform/client-programs/pkg/logger" + "github.com/educates/educates-training-platform/client-programs/pkg/utils" "github.com/cppforlife/go-cli-ui/ui" "github.com/pkg/errors" diff --git a/client-programs/pkg/installer/kappDepsFactory.go b/client-programs/pkg/installer/kappDepsFactory.go index be40b0cab..034a15244 100644 --- a/client-programs/pkg/installer/kappDepsFactory.go +++ b/client-programs/pkg/installer/kappDepsFactory.go @@ -2,7 +2,7 @@ package installer import ( core "carvel.dev/kapp/pkg/kapp/cmd/core" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" diff --git a/client-programs/pkg/renderer/hugo.go b/client-programs/pkg/renderer/hugo.go index 9c60a6535..f3b65d5bb 100644 --- a/client-programs/pkg/renderer/hugo.go +++ b/client-programs/pkg/renderer/hugo.go @@ -24,7 +24,7 @@ import ( "time" "github.com/pkg/errors" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster" + "github.com/educates/educates-training-platform/client-programs/pkg/cluster" "gopkg.in/yaml.v2" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/client-programs/pkg/resolver/resolver.go b/client-programs/pkg/resolver/resolver.go index 78dab651b..ef8e42516 100644 --- a/client-programs/pkg/resolver/resolver.go +++ b/client-programs/pkg/resolver/resolver.go @@ -15,8 +15,8 @@ import ( "github.com/docker/docker/client" "github.com/docker/go-connections/nat" "github.com/pkg/errors" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils" + "github.com/educates/educates-training-platform/client-programs/pkg/config" + "github.com/educates/educates-training-platform/client-programs/pkg/utils" ) const dnsmasqConfigTemplateData = ` diff --git a/client-programs/pkg/secrets/secrets.go b/client-programs/pkg/secrets/secrets.go index c9bba736d..568091f6d 100644 --- a/client-programs/pkg/secrets/secrets.go +++ b/client-programs/pkg/secrets/secrets.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/pkg/errors" - "github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils" + "github.com/educates/educates-training-platform/client-programs/pkg/utils" apiv1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/developer-docs/README.md b/developer-docs/README.md index 7f1ab9b88..4d23da45e 100644 --- a/developer-docs/README.md +++ b/developer-docs/README.md @@ -3,8 +3,8 @@ Developer Documentation The Educates project consists of the following Git repositories: -* Educates Training Platform - https://github.com/vmware-tanzu-labs/educates-training-platform -* Educates GitHub Actions - https://github.com/vmware-tanzu-labs/educates-github-actions +* Educates Training Platform - https://github.com/educates/educates-training-platform +* Educates GitHub Actions - https://github.com/educates/educates-github-actions The Educates Training Platform repository (this repository), holds all source code for building and making releases of the core platform, as well as documentation. diff --git a/developer-docs/project-roadmap.md b/developer-docs/project-roadmap.md index dbdc0f927..e67e5e41c 100644 --- a/developer-docs/project-roadmap.md +++ b/developer-docs/project-roadmap.md @@ -1,7 +1,7 @@ Project Roadmap =============== -The Educates project uses a GitHub [project board](https://github.com/orgs/vmware-tanzu-labs/projects/13) to track issues and feature requests. For more substantial pie-in-the-sky goals, these are outlined below. Because something is listed here doesn't mean that it will actually be done. The list is just intended to capture ideas for larger changes or new features we think would be worthwhile doing at some point so you can see where the project may be heading. +The Educates project uses a GitHub [project board](https://github.com/orgs/educates/projects/1) to track issues and feature requests. For more substantial pie-in-the-sky goals, these are outlined below. Because something is listed here doesn't mean that it will actually be done. The list is just intended to capture ideas for larger changes or new features we think would be worthwhile doing at some point so you can see where the project may be heading. Simplified course deployment ---------------------------- diff --git a/developer-docs/release-procedures.md b/developer-docs/release-procedures.md index a1e9515ad..a519fbd87 100644 --- a/developer-docs/release-procedures.md +++ b/developer-docs/release-procedures.md @@ -19,7 +19,7 @@ Triggering a Development Build For any individual code changes the developer of the changes should have already built and tested the changes on their local system. If a complete build of Educates consisting of all code changes for a release is required, a build from the `develop` branch can be triggered using a GitHub actions workflow dispatch trigger event. This can be done from the GitHub actions page of the main Educates GitHub repository located at: -* [https://github.com/vmware-tanzu-labs/educates-training-platform/actions](https://github.com/vmware-tanzu-labs/educates-training-platform/actions) +* [https://github.com/educates/educates-training-platform/actions](https://github.com/educates/educates-training-platform/actions) ![](github-actions-build.png) @@ -30,7 +30,7 @@ By default the build will only be run for the `linux/amd64` platform. The `linux Being a development build, all the container images, client programs and package bundles will be created, but neither a package repository bundle or GitHub release will be created. To test the release, clients programs and package resource manifests for installing the development version can be downloaded from the build artifacts of the GitHub actions workflow run. Client programs can also be download by using the command: ``` -imgpkg pull -i ghcr.io/vmware-tanzu-labs/educates-client-programs:develop -o /tmp/client-programs +imgpkg pull -i ghcr.io/educates/educates-client-programs:develop -o /tmp/client-programs ``` A development build prior to a release would be done against the main Educates GitHub repository. If necessary a developer of some changes could also trigger such a build using GitHub actions from their fork of the Educates GitHub repository. In this case all container image references will resolve to images built and pushed to the developers GitHub container registry namespace and not that of the main Educates GitHub repository. For more complicated changes, it possibly should be a requirement that a developer do a full development build from their fork and test it before creating a pull request with their changes. diff --git a/docker-extension/Dockerfile b/docker-extension/Dockerfile index 4ac30c0f9..8ec125f10 100644 --- a/docker-extension/Dockerfile +++ b/docker-extension/Dockerfile @@ -22,13 +22,13 @@ ARG TARGETARCH LABEL org.opencontainers.image.title="Educates Docker Desktop Extension" \ org.opencontainers.image.description="Spin up a local Educates Training Platform workshop" \ - org.opencontainers.image.vendor="VMware" \ + org.opencontainers.image.vendor="Educates" \ org.opencontainers.image.licenses="Apache-2.0" \ com.docker.desktop.extension.api.version="0.3.4" \ com.docker.extension.screenshots="" \ - com.docker.desktop.extension.icon="https://raw.githubusercontent.com/vmware-tanzu-labs/educates-training-platform/main/project-assets/educates-logo.svg" \ + com.docker.desktop.extension.icon="https://raw.githubusercontent.com/educates/educates-training-platform/main/project-assets/educates-logo.svg" \ com.docker.extension.detailed-description="Spin up a local Educates Training Platform workshop" \ - com.docker.extension.publisher-url="https://github.com/vmware-tanzu-labs/educates-training-platform" \ + com.docker.extension.publisher-url="https://github.com/educates/educates-training-platform" \ com.docker.extension.additional-urls="" \ com.docker.extension.categories="" \ com.docker.extension.changelog="" diff --git a/docker-extension/README.md b/docker-extension/README.md index bf67638ea..e690234d3 100644 --- a/docker-extension/README.md +++ b/docker-extension/README.md @@ -30,13 +30,13 @@ You can use `docker` to build, install and push your extension. Also, we provide To build the extension, use `make build-extension` **or**: ```shell - docker buildx build -t vmware-tanzu-labs/educates-docker-extension:develop . --load + docker buildx build -t educates/educates-docker-extension:develop . --load ``` To install the extension, use `make install-extension` **or**: ```shell - docker extension install vmware-tanzu-labs/educates-docker-extension:develop + docker extension install educates/educates-docker-extension:develop ``` > If you want to automate this command, use the `-f` or `--force` flag to accept the warning message. @@ -59,19 +59,19 @@ This starts a development server that listens on port `3000`. You can now tell Docker Desktop to use this as the frontend source. In another terminal run: ```shell - docker extension dev ui-source vmware-tanzu-labs/educates-docker-extension:develop http://localhost:3000 + docker extension dev ui-source educates/educates-docker-extension:develop http://localhost:3000 ``` In order to open the Chrome Dev Tools for your extension when you click on the extension tab, run: ```shell - docker extension dev debug vmware-tanzu-labs/educates-docker-extension:develop + docker extension dev debug educates/educates-docker-extension:develop ``` Each subsequent click on the extension tab will also open Chrome Dev Tools. To stop this behaviour, run: ```shell - docker extension dev reset vmware-tanzu-labs/educates-docker-extension:develop + docker extension dev reset educates/educates-docker-extension:develop ``` ### Backend development (optional) @@ -84,7 +84,7 @@ Whenever you make changes in the [backend](./backend) source code, you will need Use the `docker extension update` command to remove and re-install the extension automatically: ```shell -docker extension update vmware-tanzu-labs/educates-docker-extension:develop +docker extension update educates/educates-docker-extension:develop ``` > If you want to automate this command, use the `-f` or `--force` flag to accept the warning message. @@ -96,7 +96,7 @@ docker extension update vmware-tanzu-labs/educates-docker-extension:develop To remove the extension: ```shell -docker extension rm vmware-tanzu-labs/educates-docker-extension:develop +docker extension rm educates/educates-docker-extension:develop ``` ## What's next? diff --git a/docker-extension/ui/src/components/BottomIntroPane/BottomIntroPane.tsx b/docker-extension/ui/src/components/BottomIntroPane/BottomIntroPane.tsx index b424bb416..6fa0aeeaf 100644 --- a/docker-extension/ui/src/components/BottomIntroPane/BottomIntroPane.tsx +++ b/docker-extension/ui/src/components/BottomIntroPane/BottomIntroPane.tsx @@ -4,8 +4,8 @@ import { handleGoTo } from "../../common/goto"; export default function BottomIntroPane() { const docsURL = "https://docs.educates.dev", slackURL = "slack.com", - demoURL = "https://docs.educates.dev/project-details/sample-screenshots", - githubURL = "https://github.com/vmware-tanzu-labs/educates-training-platform"; + demoURL = "https://docs.educates.dev/en/stable/project-details/sample-screenshots", + githubURL = "https://github.com/educates/educates-training-platform"; return (