Merge branch 'release/2.6.14'

educates · Sep 25, 2023 · 36511b2 · 36511b2
2 parents fb139eb + 60c6f35
commit 36511b2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/client-programs/pkg/cmd/admin_cluster_create_cmd.go b/client-programs/pkg/cmd/admin_cluster_create_cmd.go
@@ -37,13 +37,14 @@ import (
 )
 
 type AdminClusterCreateOptions struct {
-	Config       string
-	Kubeconfig   string
-	Image        string
-	Domain       string
-	Version      string
-	WithServices bool
-	WithPlatform bool
+	Config                string
+	Kubeconfig            string
+	Image                 string
+	Domain                string
+	Version               string
+	KappControllerVersion string
+	WithServices          bool
+	WithPlatform          bool
 }
 
 func (o *AdminClusterCreateOptions) Run() error {
@@ -203,7 +204,7 @@ func (o *AdminClusterCreateOptions) Run() error {
 		deploymentFiles = append(deploymentFiles, kappConfigPath)
 	}
 
-	deploymentFiles = append(deploymentFiles, "https://github.com/vmware-tanzu/carvel-kapp-controller/releases/latest/download/release.yml")
+	deploymentFiles = append(deploymentFiles, fmt.Sprintf("https://github.com/carvel-dev/kapp-controller/releases/download/v%s/release.yml", o.KappControllerVersion))
 
 	kappConfig.FileFlags = tools.FileFlags{
 		Files: deploymentFiles,
@@ -329,6 +330,12 @@ func (p *ProjectInfo) NewAdminClusterCreateCmd() *cobra.Command {
 		p.Version,
 		"version of Educates training platform to be installed",
 	)
+	c.Flags().StringVar(
+		&o.KappControllerVersion,
+		"kapp-controller-version",
+		"0.47.0",
+		"version of kapp-controller operator to be installed",
+	)
 	c.Flags().BoolVar(
 		&o.WithServices,
 		"with-services",

diff --git a/session-manager/requirements.txt b/session-manager/requirements.txt
@@ -4,4 +4,4 @@ aiohttp==3.8.5
 PyYAML==6.0
 pykube-ng==22.1.0
 wrapt==1.14.1
-cryptography==41.0.3
+cryptography==41.0.4