Added in openshift.py task as well as support to pass in pull secret as a parameter

Author: shaina-patel-23

components/kubernetes/openshift.go

@@ -11,6 +11,7 @@ import (
 	oscomp "github.com/DataDog/test-infra-definitions/components/os"
 	"github.com/DataDog/test-infra-definitions/components/remote"
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+	sdkconfig "github.com/pulumi/pulumi/sdk/v3/go/pulumi/config"
 )
 
 func NewLocalOpenShiftCluster(env config.Env, name string, opts ...pulumi.ResourceOption) (*Cluster, error) {
@@ -57,17 +58,15 @@ func NewLocalOpenShiftCluster(env config.Env, name string, opts ...pulumi.Resour
 }
 
 func NewOpenShiftCluster(env config.Env, vm *remote.Host, name string, opts ...pulumi.ResourceOption) (*Cluster, error) {
-	pullSecretPath := os.Getenv("PULL_SECRET_PATH")
-	if pullSecretPath == "" {
-		return nil, fmt.Errorf("PULL_SECRET_PATH environment variable is not set")
-	}
-
 	return components.NewComponent(env, name, func(clusterComp *Cluster) error {
 		openShiftClusterName := env.CommonNamer().DisplayName(49)
 		opts = utils.MergeOptions[pulumi.ResourceOption](opts, pulumi.Parent(clusterComp))
 		runner := vm.OS.Runner()
 		commonEnvironment := env
 
+		infraConfig := sdkconfig.New(env.Ctx(), "ddinfra")
+		pullSecretPath := infraConfig.Require("openShiftPullSecretPath")
+
 		openShiftInstallBinary, err := InstallOpenShiftBinary(env, vm, opts...)
 		if err != nil {
 			return err

tasks/config.py

@@ -48,6 +48,7 @@ class Azure(BaseModel, extra=Extra.forbid):
         class GCP(BaseModel, extra=Extra.forbid):
             _DEFAULT_ACCOUNT = "agent-sandbox"
             publicKeyPath: Optional[str] = None
+            pullSecretPath: Optional[str] = None
             account: Optional[str] = _DEFAULT_ACCOUNT
 
         gcp: Optional[GCP] = None

tasks/doc.py

@@ -37,3 +37,4 @@
 agent_env: str = "Extra environment variables to run the agent with, the format is `VAR1=val1,VAR2=val2`"
 helm_config: str = "Path to a custom helm config file that will be merged with the default one"
 local_package: str = "Path to a local package to install, it can be either a folder or a file. If a folder is targetted we automatically take the first file with the correct extension depending on the targetted OS"
+pull_secret_path: str = "Path to the OpenShift pull secret file (required for OpenShift cluster creation)."

tasks/gcp/__init__.py

@@ -4,9 +4,12 @@
 
 from tasks.gcp.gke import create_gke, destroy_gke
 from tasks.gcp.vm import create_vm, destroy_vm
+from tasks.gcp.openshift import create_openshift, destroy_openshift
 
 collection = Collection()
 collection.add_task(destroy_vm)
 collection.add_task(create_vm)
 collection.add_task(create_gke)
 collection.add_task(destroy_gke)
+collection.add_task(create_openshift)
+collection.add_task(destroy_openshift)

tasks/gcp/openshift.py

@@ -0,0 +1,80 @@
+from typing import Optional
+
+from invoke.context import Context
+from invoke.exceptions import Exit
+from invoke.tasks import task
+from pydantic_core._pydantic_core import ValidationError
+
+from tasks import config, doc
+from tasks.config import get_full_profile_path
+from tasks.deploy import deploy
+from tasks.destroy import destroy
+
+scenario_name = "gcp/openshiftvm"
+
+
+@task(
+    help={
+        "config_path": doc.config_path,
+        "stack_name": doc.stack_name,
+        "pull_secret_path": doc.pull_secret_path,
+    }
+)
+def create_openshift(
+    ctx: Context,
+    config_path: Optional[str] = None,
+    stack_name: Optional[str] = None,
+    interactive: Optional[bool] = True,
+    pull_secret_path: Optional[str] = None,
+):
+    """
+    Create an OpenShift environment.
+    """
+
+    try:
+        cfg = config.get_local_config(config_path)
+    except ValidationError as e:
+        raise Exit(f"Error in config {get_full_profile_path(config_path)}") from e
+
+    # Use parameter if provided during invoke setup, otherwise use config
+    if not pull_secret_path:
+        pull_secret_path = cfg.get_gcp().pullSecretPath
+        if not pull_secret_path:
+            raise Exit("pull_secret_path is required. Either use invoke.gcp.create-openshift -p <pull_secret_path> or configure it with 'invoke setup'")
+
+    extra_flags = {
+        "scenario": scenario_name,
+        "ddinfra:env": f"gcp/{cfg.get_gcp().account}",
+        "ddinfra:gcp/defaultPublicKeyPath": cfg.get_gcp().publicKeyPath,
+        "ddinfra:openShiftPullSecretPath": pull_secret_path,
+    }
+
+    full_stack_name = deploy(
+        ctx,
+        scenario_name,
+        config_path,
+        stack_name=stack_name,
+        install_agent=False,
+        extra_flags=extra_flags,
+    )
+
+@task(
+    help={
+        "config_path": doc.config_path,
+        "stack_name": doc.stack_name,
+    }
+)
+def destroy_openshift(
+    ctx: Context,
+    config_path: Optional[str] = None,
+    stack_name: Optional[str] = None,
+):
+    """
+    Destroy an environment created by invoke gcp.create-openshift.
+    """
+    destroy(
+        ctx,
+        scenario_name=scenario_name,
+        config_path=config_path,
+        stack=stack_name,
+    ) 

tasks/setup.py

@@ -328,6 +328,22 @@ def setup_gcp_config(config: Config):
     if default_account:
         config.configParams.gcp.account = default_account
 
+    # openShift pull secret path
+    if config.configParams.gcp.pullSecretPath is None:
+        config.configParams.gcp.pullSecretPath = ""
+    default_pull_secret_path = config.configParams.gcp.pullSecretPath
+    while True:
+        config.configParams.gcp.pullSecretPath = default_pull_secret_path
+        pull_secret_path = ask(
+            f"🔑 Path to your OpenShift pull secret file (optional, can be set later): "
+        )
+        if pull_secret_path:
+            config.configParams.gcp.pullSecretPath = pull_secret_path
+
+        if os.path.isfile(config.configParams.gcp.pullSecretPath):
+            break
+        warn(f"{config.configParams.gcp.pullSecretPath} is not a valid file")
+
 
 def setupAgentConfig(config):
     if config.configParams.agent is None: