deprecate all Openshift templates related code

Signed-off-by: Nikolaos Moraitis <nmoraiti@redhat.com>

Author: droslean

cmd/ci-operator/main.go

@@ -69,11 +69,8 @@ import (
 	imageapi "github.com/openshift/api/image/v1"
 	projectapi "github.com/openshift/api/project/v1"
 	routev1 "github.com/openshift/api/route/v1"
-	templateapi "github.com/openshift/api/template/v1"
 	buildclientset "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
 	projectclientset "github.com/openshift/client-go/project/clientset/versioned"
-	templatescheme "github.com/openshift/client-go/template/clientset/versioned/scheme"
-	templateclientset "github.com/openshift/client-go/template/clientset/versioned/typed/template/v1"
 	hivev1 "github.com/openshift/hive/apis/hive/v1"
 
 	"github.com/openshift/ci-tools/pkg/api"
@@ -119,56 +116,12 @@ a consistent name for the target namespace that will change if any of the inputs
 This allows multiple test jobs to share common artifacts and still perform retries.
 
 The standard build steps are designed for simple command-line actions (like invoking
-"make test") but can be extended by passing one or more templates via the --template flag.
-The name of the template defines the stage and the template must contain at least one
-pod. The parameters passed to the template are the current process environment and a set
-of dynamic parameters that are inferred from previous steps. These parameters are:
+"make test").
 
-  NAMESPACE
-    The namespace generated by the operator for the given inputs or the value of
-    --namespace.
-
-  IMAGE_FORMAT
-    A string that points to the public image repository URL of the image stream(s)
-    created by the tag step. Example:
-
-      registry.svc.ci.openshift.org/ci-op-9o8bacu/stable:${component}
-
-    Will cause the template to depend on all image builds.
-
-  IMAGE_<component>
-    The public image repository URL for an output image. If specified the template
-    will depend on the image being built.
-
-  LOCAL_IMAGE_<component>
-    The public image repository URL for an image that was built during this run but
-    was not part of the output (such as pipeline cache images). If specified the
-    template will depend on the image being built.
-
-  JOB_NAME
-    The job name from the JOB_SPEC
-
-  JOB_NAME_SAFE
-    The job name in a form safe for use as a Kubernetes resource name.
-
-  JOB_NAME_HASH
-    A short hash of the job name for making tasks unique. This will not account for the target-additional-suffix.
-
-  UNIQUE_HASH
-	A hash for making tasks unique, even when the job name may be the same due to using the target-additional-suffix.
-
-  RPM_REPO_<org>_<repo>
-    If the job creates RPMs this will be the public URL that can be used as the
-		baseurl= value of an RPM repository. The value of org and repo are uppercased
-		and dashes are replaced with underscores.
-
-Dynamic environment variables are overridden by process environment variables.
-
-Both test and template jobs can gather artifacts created by pods. Set
---artifact-dir to define the top level artifact directory, and any test task
-that defines artifact_dir or template that has an "artifacts" volume mounted
-into a container will have artifacts extracted after the container has completed.
-Errors in artifact extraction will not cause build failures.
+Artifacts can be gathered from test pods. Set --artifact-dir to define the top level
+artifact directory, and any test task that defines artifact_dir will have artifacts
+extracted after the container has completed. Errors in artifact extraction will not
+cause build failures.
 
 In CI environments the inputs to a job may be different than what a normal
 development workflow would use. The --override file will override fields
@@ -366,7 +319,6 @@ func (s *stringSlice) Set(value string) error {
 type options struct {
 	configSpecPath       string
 	unresolvedConfigPath string
-	templatePaths        stringSlice
 	secretDirectories    stringSlice
 	sshKeyPath           string
 	oauthTokenPath       string
@@ -392,7 +344,6 @@ type options struct {
 
 	inputHash                  string
 	secrets                    []*coreapi.Secret
-	templates                  []*templateapi.Template
 	graphConfig                api.GraphConfiguration
 	configSpec                 *api.ReleaseBuildConfiguration
 	jobSpec                    *api.JobSpec
@@ -480,7 +431,6 @@ func bindOptions(flag *flag.FlagSet) *options {
 	flag.BoolVar(&opt.printGraph, "print-graph", opt.printGraph, "Print a directed graph of the build steps and exit. Intended for use with the golang digraph utility.")
 
 	// add to the graph of things we run or create
-	flag.Var(&opt.templatePaths, "template", "A set of paths to optional templates to add as stages to this job. Each template is expected to contain at least one restart=Never pod. Parameters are filled from environment or from the automatic parameters generated by the operator.")
 	flag.Var(&opt.secretDirectories, "secret-dir", "One or more directories that should converted into secrets in the test namespace. If the directory contains a single file with name .dockercfg or config.json it becomes a pull secret.")
 	flag.StringVar(&opt.sshKeyPath, "ssh-key-path", "", "A path of the private ssh key that is going to be used to clone a private repository.")
 	flag.StringVar(&opt.oauthTokenPath, "oauth-token-path", "", "A path of the OAuth token that is going to be used to clone a private repository.")
@@ -683,26 +633,6 @@ func (o *options) Complete() error {
 
 	o.getClusterProfileNamesFromTargets()
 
-	for _, path := range o.templatePaths.values {
-		contents, err := os.ReadFile(path)
-		if err != nil {
-			return fmt.Errorf("could not read dir %s for template: %w", path, err)
-		}
-		obj, gvk, err := templatescheme.Codecs.UniversalDeserializer().Decode(contents, nil, nil)
-		if err != nil {
-			return fmt.Errorf("unable to parse template %s: %w", path, err)
-		}
-		template, ok := obj.(*templateapi.Template)
-		if !ok {
-			return fmt.Errorf("%s is not a template: %v", path, gvk)
-		}
-		if len(template.Name) == 0 {
-			template.Name = filepath.Base(path)
-			template.Name = strings.TrimSuffix(template.Name, filepath.Ext(template.Name))
-		}
-		o.templates = append(o.templates, template)
-	}
-
 	clusterConfig, err := util.LoadClusterConfig()
 	if err != nil {
 		return fmt.Errorf("failed to load cluster config: %w", err)
@@ -761,7 +691,6 @@ func (o *options) ToGraphConfig() *defaults.Config {
 		CIConfig:                    o.configSpec,
 		GraphConf:                   &o.graphConfig,
 		JobSpec:                     o.jobSpec,
-		Templates:                   o.templates,
 		ParamFile:                   o.writeParams,
 		Promote:                     o.promote,
 		ClusterConfig:               o.clusterConfig,
@@ -1997,13 +1926,6 @@ func (o *options) saveNamespaceArtifacts() {
 		_ = api.SaveArtifact(o.censor, path, data)
 	}
 
-	if templateClient, err := templateclientset.NewForConfig(o.clusterConfig); err == nil {
-		templateInstances, _ := templateClient.TemplateInstances(o.namespace).List(context.TODO(), metav1.ListOptions{})
-		data, _ := json.MarshalIndent(templateInstances, "", "  ")
-		path := filepath.Join(namespaceDir, "templateinstances.json")
-		_ = api.SaveArtifact(o.censor, path, data)
-	}
-
 	o.metricsAgent.Record(metrics.NewInsightsEvent(metrics.InsightNamespaceArtifacts, metrics.Context{"namespace": o.namespace}))
 }
 
@@ -2240,7 +2162,7 @@ func eventRecorder(kubeClient *coreclientset.CoreV1Client, authClient *authclien
 	eventBroadcaster.StartRecordingToSink(&coreclientset.EventSinkImpl{
 		Interface: coreclientset.New(kubeClient.RESTClient()).Events("")})
 	return eventBroadcaster.NewRecorder(
-		templatescheme.Scheme, coreapi.EventSource{Component: namespace}), nil
+		scheme.Scheme, coreapi.EventSource{Component: namespace}), nil
 }
 
 func getCloneSecretFromPath(cloneAuthType steps.CloneAuthType, secretPath string) (*coreapi.Secret, error) {
@@ -2538,9 +2460,6 @@ func addSchemes() error {
 	if err := buildv1.AddToScheme(scheme.Scheme); err != nil {
 		return fmt.Errorf("failed to add buildv1 to scheme: %w", err)
 	}
-	if err := templateapi.AddToScheme(scheme.Scheme); err != nil {
-		return fmt.Errorf("failed to add templatev1 to scheme: %w", err)
-	}
 	if err := hivev1.AddToScheme(scheme.Scheme); err != nil {
 		return fmt.Errorf("failed to add hivev1 to scheme: %w", err)
 	}

cmd/ci-operator/main_test.go

@@ -623,42 +623,6 @@ tests:
     verify -k
   container:
     from: bin
-- as: e2e-aws
-  commands: TEST_SUITE=openshift/conformance/parallel run-tests
-  openshift_installer:
-    cluster_profile: aws
-- as: e2e-aws-all
-  commands: TEST_SUITE=openshift/conformance run-tests
-  openshift_installer:
-    cluster_profile: aws
-- as: e2e-aws-builds
-  commands: TEST_SUITE=openshift/build run-tests
-  openshift_installer:
-    cluster_profile: aws
-- as: e2e-aws-image-ecosystem
-  commands: TEST_SUITE=openshift/image-ecosystem run-tests
-  openshift_installer:
-    cluster_profile: aws
-- as: e2e-aws-image-registry
-  commands: TEST_SUITE=openshift/image-registry run-tests
-  openshift_installer:
-    cluster_profile: aws
-- as: e2e-aws-serial
-  commands: TEST_SUITE=openshift/conformance/serial run-tests
-  openshift_installer:
-    cluster_profile: aws
-- as: launch-aws
-  commands: sleep 7200 & wait
-  openshift_installer:
-    cluster_profile: aws
-- as: e2e-upi-aws
-  commands: TEST_SUITE=openshift/conformance/serial run-tests
-  openshift_installer_upi:
-    cluster_profile: aws
-- as: e2e-upi-src-vsphere
-  commands: make tests
-  openshift_installer_upi_src:
-    cluster_profile: vsphere-2
 `
 
 var parsedConfig = &api.ReleaseBuildConfiguration{
@@ -848,60 +812,6 @@ var parsedConfig = &api.ReleaseBuildConfiguration{
 		ContainerTestConfiguration: &api.ContainerTestConfiguration{
 			From: "bin",
 		},
-	}, {
-		As:       "e2e-aws",
-		Commands: `TEST_SUITE=openshift/conformance/parallel run-tests`,
-		OpenshiftInstallerClusterTestConfiguration: &api.OpenshiftInstallerClusterTestConfiguration{
-			ClusterTestConfiguration: api.ClusterTestConfiguration{ClusterProfile: "aws"},
-		},
-	}, {
-		As:       "e2e-aws-all",
-		Commands: `TEST_SUITE=openshift/conformance run-tests`,
-		OpenshiftInstallerClusterTestConfiguration: &api.OpenshiftInstallerClusterTestConfiguration{
-			ClusterTestConfiguration: api.ClusterTestConfiguration{ClusterProfile: "aws"},
-		},
-	}, {
-		As:       "e2e-aws-builds",
-		Commands: `TEST_SUITE=openshift/build run-tests`,
-		OpenshiftInstallerClusterTestConfiguration: &api.OpenshiftInstallerClusterTestConfiguration{
-			ClusterTestConfiguration: api.ClusterTestConfiguration{ClusterProfile: "aws"},
-		},
-	}, {
-		As:       "e2e-aws-image-ecosystem",
-		Commands: `TEST_SUITE=openshift/image-ecosystem run-tests`,
-		OpenshiftInstallerClusterTestConfiguration: &api.OpenshiftInstallerClusterTestConfiguration{
-			ClusterTestConfiguration: api.ClusterTestConfiguration{ClusterProfile: "aws"},
-		},
-	}, {
-		As:       "e2e-aws-image-registry",
-		Commands: `TEST_SUITE=openshift/image-registry run-tests`,
-		OpenshiftInstallerClusterTestConfiguration: &api.OpenshiftInstallerClusterTestConfiguration{
-			ClusterTestConfiguration: api.ClusterTestConfiguration{ClusterProfile: "aws"},
-		},
-	}, {
-		As:       "e2e-aws-serial",
-		Commands: `TEST_SUITE=openshift/conformance/serial run-tests`,
-		OpenshiftInstallerClusterTestConfiguration: &api.OpenshiftInstallerClusterTestConfiguration{
-			ClusterTestConfiguration: api.ClusterTestConfiguration{ClusterProfile: "aws"},
-		},
-	}, {
-		As:       "launch-aws",
-		Commands: `sleep 7200 & wait`,
-		OpenshiftInstallerClusterTestConfiguration: &api.OpenshiftInstallerClusterTestConfiguration{
-			ClusterTestConfiguration: api.ClusterTestConfiguration{ClusterProfile: "aws"},
-		},
-	}, {
-		As:       "e2e-upi-aws",
-		Commands: `TEST_SUITE=openshift/conformance/serial run-tests`,
-		OpenshiftInstallerUPIClusterTestConfiguration: &api.OpenshiftInstallerUPIClusterTestConfiguration{
-			ClusterTestConfiguration: api.ClusterTestConfiguration{ClusterProfile: "aws"},
-		},
-	}, {
-		As:       "e2e-upi-src-vsphere",
-		Commands: `make tests`,
-		OpenshiftInstallerUPISrcClusterTestConfiguration: &api.OpenshiftInstallerUPISrcClusterTestConfiguration{
-			ClusterTestConfiguration: api.ClusterTestConfiguration{ClusterProfile: "vsphere-2"},
-		},
 	}},
 }