Merge branch 'release/3.1.0'

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 [email protected].
+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

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/).

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) |

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
 ------------------------

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
 

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.
 

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
 

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 {

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 {

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"
 )
 

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 (

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 {

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 (

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 (

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"

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"
 )

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"

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"

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"

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 {

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"

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 {

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 {

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"

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"

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"

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"

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) {

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"

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"
 )
 

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"

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 (

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 {

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 {

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 {

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 {

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 {