Merge pull request #987 from vikram-raj/odc-7790

ODC-7790: Remove ODO download link

Author: openshift-merge-bot[bot]

pkg/api/api.go

@@ -19,7 +19,6 @@ const (
 	OAuthConfigMapName                  = "oauth-openshift"
 	OAuthServingCertConfigMapName       = "oauth-serving-cert"
 	OCCLIDownloadsCustomResourceName    = "oc-cli-downloads"
-	ODOCLIDownloadsCustomResourceName   = "odo-cli-downloads"
 	OLMConfigGroup                      = "operators.coreos.com"
 	OLMConfigResource                   = "olmconfigs"
 	OLMConfigVersion                    = "v1"

pkg/console/controllers/clidownloads/controller.go

@@ -155,20 +155,13 @@ func (c *CLIDownloadsSyncController) Sync(ctx context.Context, controllerContext
 		return statusHandler.FlushAndReturn(ocCLIDownloadsErr)
 	}
 
-	_, odoCLIDownloadsErrReason, odoCLIDownloadsErr := ApplyCLIDownloads(ctx, c.consoleCliDownloadsClient, ODOConsoleCLIDownloads())
-	statusHandler.AddCondition(status.HandleDegraded("ODODownloadsSync", odoCLIDownloadsErrReason, odoCLIDownloadsErr))
-	if odoCLIDownloadsErr != nil {
-		return statusHandler.FlushAndReturn(odoCLIDownloadsErr)
-	}
-
 	return statusHandler.FlushAndReturn(nil)
 }
 
 func (c *CLIDownloadsSyncController) removeCLIDownloads(ctx context.Context) error {
 	defer klog.V(4).Info("finished deleting ConsoleCliDownloads custom resources")
 	var errs []error
 	errs = append(errs, c.consoleCliDownloadsClient.Delete(ctx, api.OCCLIDownloadsCustomResourceName, metav1.DeleteOptions{}))
-	errs = append(errs, c.consoleCliDownloadsClient.Delete(ctx, api.ODOCLIDownloadsCustomResourceName, metav1.DeleteOptions{}))
 	return utilerrors.FilterOut(utilerrors.NewAggregate(errs), errors.IsNotFound)
 }
 
@@ -220,27 +213,6 @@ The oc binary offers the same capabilities as the kubectl binary, but it is furt
 	}
 }
 
-func ODOConsoleCLIDownloads() *v1.ConsoleCLIDownload {
-	return &v1.ConsoleCLIDownload{
-		ObjectMeta: metav1.ObjectMeta{
-			Name: api.ODOCLIDownloadsCustomResourceName,
-		},
-		Spec: v1.ConsoleCLIDownloadSpec{
-			Description: `odo is a fast, iterative, and straightforward CLI tool for developers who write, build, and deploy applications on OpenShift.
-
-odo abstracts away complex Kubernetes and OpenShift concepts, thus allowing developers to focus on what is most important to them: code.
-`,
-			DisplayName: "odo - Developer-focused CLI for OpenShift (Community Support)",
-			Links: []v1.CLIDownloadLink{
-				{
-					Href: "https://developers.redhat.com/content-gateway/rest/mirror/pub/openshift-v4/clients/odo/latest",
-					Text: "Download odo",
-				},
-			},
-		},
-	}
-}
-
 // TODO: All the custom `Apply*` functions should be at some point be placed into:
 // openshift/library-go/pkg/console/resource/resourceapply/core.go
 func ApplyCLIDownloads(ctx context.Context, consoleClient consoleclientv1.ConsoleCLIDownloadInterface, requiredCLIDownloads *v1.ConsoleCLIDownload) (*v1.ConsoleCLIDownload, string, error) {

pkg/console/starter/starter.go

@@ -493,10 +493,12 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
 			// we are need to backport the removal of these conditions all the way down to 4.10
 			// since we only remove them in https://github.com/openshift/console-operator/pull/662
 			// and its causing upgrade issues to the customers
+			// in 4.20 we removed ODOConsoleCLIDownloads and can remove ODODownloadsSyncDegraded in 4.21
 			"CustomRouteSyncDegraded",
 			"CustomRouteSyncProgressing",
 			"DefaultRouteSyncDegraded",
 			"DefaultRouteSyncProgressing",
+			"ODODownloadsSyncDegraded",
 		},
 		operatorClient,
 		controllerContext.EventRecorder,

test/e2e/framework/framework.go

@@ -47,7 +47,6 @@ func getTestingResources() []TestingResource {
 	return []TestingResource{
 		{"ConfigMap", consoleapi.OpenShiftConsoleConfigMapName, consoleapi.OpenShiftConsoleNamespace},
 		{"ConsoleCLIDownloads", consoleapi.OCCLIDownloadsCustomResourceName, ""},
-		{"ConsoleCLIDownloads", consoleapi.ODOCLIDownloadsCustomResourceName, ""},
 		{"Deployment", consoleapi.OpenShiftConsoleDeploymentName, consoleapi.OpenShiftConsoleNamespace},
 		{"Deployment", consoleapi.OpenShiftConsoleDownloadsDeploymentName, consoleapi.OpenShiftConsoleNamespace},
 		{"Route", consoleapi.OpenShiftConsoleRouteName, consoleapi.OpenShiftConsoleNamespace},

test/e2e/managed_test.go

@@ -70,7 +70,6 @@ func TestEditManagedConsoleCLIDownloads(t *testing.T) {
 		t.Fatalf("error: %s", err)
 	}
 
-	err = patchAndCheckConsoleCLIDownloads(t, client, true, api.ODOCLIDownloadsCustomResourceName)
 	if err != nil {
 		t.Fatalf("error: %s", err)
 	}

test/e2e/unmanaged_test.go

@@ -75,7 +75,6 @@ func TestEditUnmanagedConsoleCLIDownloads(t *testing.T) {
 		t.Fatalf("error: %s", err)
 	}
 
-	err = patchAndCheckConsoleCLIDownloads(t, client, false, api.ODOCLIDownloadsCustomResourceName)
 	if err != nil {
 		t.Fatalf("error: %s", err)
 	}