slim-runtime

Author: danielm-codefresh

cmd/commands/runtime_install.go

@@ -559,7 +559,8 @@ func getComponents(rt *runtime.Runtime, opts *RuntimeInstallOptions) []string {
 	}
 
 	//  should find a more dynamic way to get these additional components
-	additionalComponents := []string{"events-reporter", "workflow-reporter", "rollout-reporter"}
+	// additionalComponents := []string{"events-reporter", "workflow-reporter", "rollout-reporter"}
+	additionalComponents := []string{"events-reporter", "rollout-reporter"}
 	for _, additionalComponentName := range additionalComponents {
 		componentFullName := fmt.Sprintf("%s-%s", opts.RuntimeName, additionalComponentName)
 		componentNames = append(componentNames, componentFullName)
@@ -1060,15 +1061,15 @@ func installComponents(ctx context.Context, opts *RuntimeInstallOptions, rt *run
 
 	// this will add `/workflows` suffix to the argo-server deployment
 	// we need this both in ingress and tunnel mode
-	if opts.shouldInstallIngress() && rt.Spec.IngressController != string(routingutil.IngressControllerALB) || rt.Spec.AccessMode == platmodel.AccessModeTunnel {
-		if err = util.Retry(ctx, &util.RetryOptions{
-			Func: func() error {
-				return configureArgoWorkflows(ctx, opts, rt)
-			},
-		}); err != nil {
-			return fmt.Errorf("failed to patch Argo Worfkflows configuration: %w", err)
-		}
-	}
+	// if opts.shouldInstallIngress() && rt.Spec.IngressController != string(routingutil.IngressControllerALB) || rt.Spec.AccessMode == platmodel.AccessModeTunnel {
+	// 	if err = util.Retry(ctx, &util.RetryOptions{
+	// 		Func: func() error {
+	// 			return configureArgoWorkflows(ctx, opts, rt)
+	// 		},
+	// 	}); err != nil {
+	// 		return fmt.Errorf("failed to patch Argo Worfkflows configuration: %w", err)
+	// 	}
+	// }
 
 	if err = util.Retry(ctx, &util.RetryOptions{
 		Func: func() error {
@@ -1082,21 +1083,21 @@ func installComponents(ctx context.Context, opts *RuntimeInstallOptions, rt *run
 		return fmt.Errorf("failed to create events-reporter: %w", err)
 	}
 
-	if err = createReporter(
-		ctx, opts.InsCloneOpts, opts, reporterCreateOptions{
-			reporterName: store.Get().WorkflowReporterName,
-			gvr: []gvr{
-				{
-					resourceName: store.Get().WorkflowResourceName,
-					group:        "argoproj.io",
-					version:      "v1alpha1",
-				},
-			},
-			saName:     store.Get().CodefreshSA,
-			IsInternal: true,
-		}); err != nil {
-		return fmt.Errorf("failed to create workflows-reporter: %w", err)
-	}
+	// if err = createReporter(
+	// 	ctx, opts.InsCloneOpts, opts, reporterCreateOptions{
+	// 		reporterName: store.Get().WorkflowReporterName,
+	// 		gvr: []gvr{
+	// 			{
+	// 				resourceName: store.Get().WorkflowResourceName,
+	// 				group:        "argoproj.io",
+	// 				version:      "v1alpha1",
+	// 			},
+	// 		},
+	// 		saName:     store.Get().CodefreshSA,
+	// 		IsInternal: true,
+	// 	}); err != nil {
+	// 	return fmt.Errorf("failed to create workflows-reporter: %w", err)
+	// }
 
 	if err = createReporter(ctx, opts.InsCloneOpts, opts, reporterCreateOptions{
 		reporterName: store.Get().RolloutReporterName,

manifests/internal-router/internal-router.cm.yaml

@@ -9,37 +9,29 @@ data:
       root /usr/local/app;
       access_log /dev/stdout main;
       error_log /dev/stdout;
-    
-    
+
+
       location /app-proxy {
         # WebSocket support
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
         chunked_transfer_encoding off;
-    
+
         proxy_pass http://cap-app-proxy:3017;
       }
-    
-      location /workflows/ {
-        # sse
-        proxy_set_header Connection '';
-        proxy_http_version 1.1;
-        chunked_transfer_encoding off;
-    
-        proxy_pass https://argo-server:2746/;
-      }
-    
+
       location ~ /webhooks/([^/]+)/([^/]+) {
         resolver kube-dns.kube-system.svc.cluster.local valid=10s;
         proxy_pass http://$2-eventsource-svc.$1.svc.cluster.local;
       }
-    
+
       location /readyz {
         return 200 'ok';
       }
-    
+
       location /healthz {
         return 200 'ok';
       }
-    }
+    }
+

pkg/store/store.go

@@ -262,7 +262,7 @@ func init() {
 	s.InClusterPath = "/bootstrap/cluster-resources/in-cluster"
 	s.SccName = "cf-scc"
 	s.CFInternalGitSources = []string{s.MarketplaceGitSourceName}
-	s.CFInternalReporters = []string{s.EventsReporterName, s.WorkflowReporterName, s.RolloutReporterName}
+	s.CFInternalReporters = []string{s.EventsReporterName, s.RolloutReporterName}
 	s.InCluster = "https://kubernetes.default.svc"
 	s.IscRuntimesDir = "runtimes"
 	s.DefVersionToLastCLIVersion = map[string]string{