Merge branch 'release/2.6.7'

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -9,45 +9,18 @@ body:
       value: |
         Thanks for taking the time to fill out this bug report!
 
-  - type: textarea
-    id: project-version
-    attributes:
-      label: Project version
-      description: What version of this project are you using?
-    validations:
-      required: true
-
   - type: textarea
     id: describe-bug
     attributes:
       label: Describe the bug
-      description: A clear and concise description of what the bug is.
+      description: A clear and concise description of what the bug is, including steps to reproduce it and the expected behaviour.
     validations:
       required: true
 
   - type: textarea
-    id: reproduction-steps
+    id: additional-information
     attributes:
-      label: Reproduction steps
-      description: Steps to reproduce the behavior
-      value: |
-        1.
-        2.
-        3.
-        ...
+      label: Additional information
+      description: Add any other information such as version details for Educates, Kubernetes, Docker and the host operating system.
     validations:
-      required: true
-
-  - type: textarea
-    id: expected-behavior
-    attributes:
-      label: Expected behavior
-      description: A clear and concise description of what you expected to happen.
-    validations:
-      required: true
-
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.
+      required: false

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -29,9 +29,9 @@ body:
       required: false
 
   - type: textarea
-    id: additional-context
+    id: additional-information
     attributes:
-      label: Additional context
-      description: Add any other context or screenshots about the feature request here.
+      label: Additional information
+      description: Add any other information relevant to the feature request here.
     validations:
       required: false

.github/PULL_REQUEST_TEMPLATE.yml

@@ -10,31 +10,30 @@ body:
         Please note that as per our contribution guidelines, unless the pull
         request is for a simple typo correction or obvious bug fix, it's
         recommended to initiate a discussion by first raising an issue. This
-        enables us to assess proposed modifications and ascertain whether they
-        necessitate adjustments to the core platform or if there's a more
-        effective approach to achieve the desired outcome without making
-        modifications.
+        enables us to assess proposed changes and evaluate whether a change to
+        the core platform is really needed, or if there's a more effective
+        approach to achieve the desired outcome without making the changes. 
 
   - type: textarea
-    id: related-issues
+    id: change-summary
     attributes:
-      label: Related issue(s) for this pull request
-      description: Link(s) to the issues this pull request is addressing.
+      label: Summary of the changes being made by this pull request
+      description: An overview of the changes you've made and why they are necessary.
     validations:
       required: true
 
   - type: textarea
-    id: change-summary
+    id: related-issues
     attributes:
-      label: Summary of the changes being made by this pull request
-      description: An overview of the changes you've made and why they are necessary.
+      label: Related issue(s) for this pull request
+      description: Link(s) to the GitHub issues this pull request is addressing.
     validations:
-      required: true
+      required: false
 
   - type: textarea
-    id: additional-context
+    id: additional-information
     attributes:
-      label: Additional context
-      description: Add any other context or screenshots related to the changes here.
+      label: Additional information
+      description: Add any other information related to the changes.
     validations:
       required: false

CONTRIBUTING.md

@@ -26,7 +26,7 @@ Please familiarize yourself with the [Code of Conduct](CODE_OF_CONDUCT.md) befor
 
 ## 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](https://cla.vmware.com/faq)).
+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
 
@@ -51,8 +51,8 @@ Before submitting your pull request, we advise you to use the following:
 
 ### Pull Request Checklist
 
-1. Check if your code changes will pass any code linting checks and unit tests which may be used by the project.
-2. Ensure your commit messages are descriptive. We follow the conventions on [How to Write a Git Commit Message](http://chris.beams.io/posts/git-commit/). Be sure to include any related GitHub issue references in the commit message. See [GFM syntax](https://guides.github.com/features/mastering-markdown/#GitHub-flavored-markdown) for referencing issues and commits.
+1. Ensure that you have not included any personal or company copyright notices in any changes. This project relies on a single copyright assignment in the [NOTICE](NOTICE) file with attribution to "The Educates Authors".
+2. Ensure your commit messages are descriptive. We aim to follow the conventions on [How to Write a Git Commit Message](http://chris.beams.io/posts/git-commit/). Be sure to include any related GitHub issue references in the commit message. See [GFM syntax](https://guides.github.com/features/mastering-markdown/#GitHub-flavored-markdown) for referencing issues and commits.
 3. Check the commits and commits messages and ensure they are free from typos.
 
 ## Reporting Bugs and Creating Issues

client-programs/cmd/educates/main.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 /*
 Command line client for Educates.
 */

client-programs/pkg/cluster/cluster.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cluster
 
 import (

client-programs/pkg/cluster/kindcluster.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cluster
 
 import (

client-programs/pkg/cmd/admin_cluster_cmd_group.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_cluster_create_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_cluster_delete_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_cluster_start_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_cluster_stop_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_cmd_group.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_config_cmd_group.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_config_edit_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_config_reset_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_config_view_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_platform_cmd_group.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_platform_config_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_platform_delete_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_platform_deploy_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_registry_cmd_group.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_registry_delete_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_registry_deploy_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_resolver_cmd_group.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_resolver_delete_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_resolver_deploy_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_secrets_add_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_secrets_cmd_group.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_secrets_export_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_secrets_import_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_secrets_list_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_secrets_remove_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_secrets_sync_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_services_cmd_group.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_services_config_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_services_delete_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/admin_services_deploy_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/cluster_cmd_group.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/cluster_portal_cmd_group.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/cluster_portal_create_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/cluster_portal_delete_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/cluster_portal_list_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/cluster_portal_open_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/cluster_portal_password_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/cluster_session_cmd_group.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/cluster_session_extend_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/cluster_session_list_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (

client-programs/pkg/cmd/cluster_session_status_cmd.go

@@ -1,5 +1,3 @@
-// Copyright 2022-2023 The Educates Authors.
-
 package cmd
 
 import (