From fe709ecaddb9bbb07e3add5fde1f3097fddfc947 Mon Sep 17 00:00:00 2001 From: Raj Babu Das Date: Tue, 15 Jun 2021 09:42:56 +0530 Subject: [PATCH] Removing Argo server deployment from the agent list (#2893) * Removin Argo server deployment from the agent list Signed-off-by: Raj Das * Removing Argo server env from the okteto manifest Signed-off-by: Raj Das * removing argoserver from agent-config Signed-off-by: Raj Das --- litmus-portal/cluster-k8s-manifest.yml | 2 - .../manifests/cluster/1b_argo_rbac.yaml | 65 --------------- .../manifests/cluster/1d_argo_deployment.yaml | 46 ----------- .../cluster/3b_agents_deployment.yaml | 2 +- .../manifests/namespace/1a_argo_rbac.yaml | 82 ------------------- .../namespace/1c_argo_deployment.yaml | 51 ------------ .../namespace/3b_agents_deployment.yaml | 2 +- .../pkg/file_handlers/file_handlers.go | 1 - .../pkg/types/configurations.go | 1 - litmus-portal/graphql-server/server.go | 2 +- litmus-portal/graphql-server/utils/misc.go | 1 - litmus-portal/namespaced-k8s-template.yml | 2 - .../litmus-portal-dev-manifest-template.yml | 2 - litmus-portal/run.sh | 1 - 14 files changed, 3 insertions(+), 257 deletions(-) diff --git a/litmus-portal/cluster-k8s-manifest.yml b/litmus-portal/cluster-k8s-manifest.yml index b33e51d94..ed49348e2 100644 --- a/litmus-portal/cluster-k8s-manifest.yml +++ b/litmus-portal/cluster-k8s-manifest.yml @@ -159,8 +159,6 @@ spec: value: "litmuschaos/litmusportal-subscriber:ci" - name: EVENT_TRACKER_IMAGE value: "litmuschaos/litmusportal-event-tracker:ci" - - name: ARGO_SERVER_IMAGE - value: "litmuschaos/argocli:v2.9.3" - name: ARGO_WORKFLOW_CONTROLLER_IMAGE value: "litmuschaos/workflow-controller:v2.9.3" - name: ARGO_WORKFLOW_EXECUTOR_IMAGE diff --git a/litmus-portal/graphql-server/manifests/cluster/1b_argo_rbac.yaml b/litmus-portal/graphql-server/manifests/cluster/1b_argo_rbac.yaml index 88d69b91b..963908b82 100644 --- a/litmus-portal/graphql-server/manifests/cluster/1b_argo_rbac.yaml +++ b/litmus-portal/graphql-server/manifests/cluster/1b_argo_rbac.yaml @@ -5,12 +5,6 @@ metadata: name: argo namespace: #{AGENT-NAMESPACE} --- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: argo-server - namespace: #{AGENT-NAMESPACE} ---- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: @@ -183,52 +177,6 @@ rules: - delete --- apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: argo-server-cluster-role -rules: - - apiGroups: - - "" - resources: - - configmaps - verbs: - - get - - watch - - list - - apiGroups: - - "" - resources: - - secrets - verbs: - - get - - apiGroups: - - "" - resources: - - pods - - pods/exec - - pods/log - verbs: - - get - - list - - watch - - delete - - apiGroups: - - argoproj.io - resources: - - workflows - - workflowtemplates - - cronworkflows - - clusterworkflowtemplates - verbs: - - create - - get - - list - - watch - - update - - patch - - delete ---- -apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: argo-binding @@ -239,17 +187,4 @@ roleRef: subjects: - kind: ServiceAccount name: argo - namespace: #{AGENT-NAMESPACE} ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: argo-server-binding -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: argo-server-cluster-role -subjects: - - kind: ServiceAccount - name: argo-server namespace: #{AGENT-NAMESPACE} \ No newline at end of file diff --git a/litmus-portal/graphql-server/manifests/cluster/1d_argo_deployment.yaml b/litmus-portal/graphql-server/manifests/cluster/1d_argo_deployment.yaml index e17125475..3491940ed 100644 --- a/litmus-portal/graphql-server/manifests/cluster/1d_argo_deployment.yaml +++ b/litmus-portal/graphql-server/manifests/cluster/1d_argo_deployment.yaml @@ -1,19 +1,6 @@ --- apiVersion: v1 kind: Service -metadata: - name: argo-server - namespace: #{AGENT-NAMESPACE} -spec: - ports: - - name: web - port: 2746 - targetPort: 2746 - selector: - app: argo-server ---- -apiVersion: v1 -kind: Service metadata: name: workflow-controller-metrics namespace: #{AGENT-NAMESPACE} @@ -28,39 +15,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - name: argo-server - namespace: #{AGENT-NAMESPACE} -spec: - selector: - matchLabels: - app: argo-server - template: - metadata: - labels: - app: argo-server - spec: - containers: - - args: - - server - image: #{ARGO-SERVER} - name: argo-server - ports: - - containerPort: 2746 - name: web - readinessProbe: - httpGet: - path: / - port: 2746 - scheme: HTTP - initialDelaySeconds: 10 - periodSeconds: 20 - nodeSelector: - kubernetes.io/os: linux - serviceAccountName: argo-server ---- -apiVersion: apps/v1 -kind: Deployment metadata: name: workflow-controller namespace: #{AGENT-NAMESPACE} diff --git a/litmus-portal/graphql-server/manifests/cluster/3b_agents_deployment.yaml b/litmus-portal/graphql-server/manifests/cluster/3b_agents_deployment.yaml index e7ce74874..fa4a80160 100644 --- a/litmus-portal/graphql-server/manifests/cluster/3b_agents_deployment.yaml +++ b/litmus-portal/graphql-server/manifests/cluster/3b_agents_deployment.yaml @@ -11,7 +11,7 @@ data: AGENT_SCOPE: #{AGENT-SCOPE} IS_CLUSTER_CONFIRMED: "false" COMPONENTS: | - DEPLOYMENTS: ["app=chaos-exporter", "name=chaos-operator", "app=argo-server", "app=event-tracker", "app=workflow-controller"] + DEPLOYMENTS: ["app=chaos-exporter", "name=chaos-operator", "app=event-tracker", "app=workflow-controller"] --- apiVersion: apps/v1 kind: Deployment diff --git a/litmus-portal/graphql-server/manifests/namespace/1a_argo_rbac.yaml b/litmus-portal/graphql-server/manifests/namespace/1a_argo_rbac.yaml index fd74290c8..3765a33ff 100644 --- a/litmus-portal/graphql-server/manifests/namespace/1a_argo_rbac.yaml +++ b/litmus-portal/graphql-server/manifests/namespace/1a_argo_rbac.yaml @@ -5,12 +5,6 @@ metadata: name: argo namespace: #{AGENT-NAMESPACE} --- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: argo-server - namespace: #{AGENT-NAMESPACE} ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -185,68 +179,6 @@ rules: - delete --- apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argo-server-role - namespace: #{AGENT-NAMESPACE} -rules: - - apiGroups: - - "" - resources: - - configmaps - verbs: - - get - - watch - - list - - apiGroups: - - "" - resources: - - secrets - verbs: - - get - - apiGroups: - - "" - resources: - - pods - - pods/exec - - pods/log - verbs: - - get - - list - - watch - - delete - - apiGroups: - - "" - resources: - - events - verbs: - - watch - - create - - patch - - apiGroups: - - "" - resources: - - secrets - - serviceaccounts - verbs: - - get - - apiGroups: - - argoproj.io - resources: - - workflows - - workfloweventbindings - - workflowtemplates - - cronworkflows - verbs: - - create - - get - - list - - watch - - update - - patch - - delete ---- -apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: argo-binding @@ -258,18 +190,4 @@ roleRef: subjects: - kind: ServiceAccount name: argo - namespace: #{AGENT-NAMESPACE} ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argo-server-binding - namespace: #{AGENT-NAMESPACE} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: argo-server-role -subjects: - - kind: ServiceAccount - name: argo-server namespace: #{AGENT-NAMESPACE} \ No newline at end of file diff --git a/litmus-portal/graphql-server/manifests/namespace/1c_argo_deployment.yaml b/litmus-portal/graphql-server/manifests/namespace/1c_argo_deployment.yaml index 59d2cb466..39556208d 100644 --- a/litmus-portal/graphql-server/manifests/namespace/1c_argo_deployment.yaml +++ b/litmus-portal/graphql-server/manifests/namespace/1c_argo_deployment.yaml @@ -1,19 +1,6 @@ --- apiVersion: v1 kind: Service -metadata: - name: argo-server - namespace: #{AGENT-NAMESPACE} -spec: - ports: - - name: web - port: 2746 - targetPort: 2746 - selector: - app: argo-server ---- -apiVersion: v1 -kind: Service metadata: name: workflow-controller-metrics namespace: #{AGENT-NAMESPACE} @@ -28,44 +15,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - name: argo-server - namespace: #{AGENT-NAMESPACE} -spec: - selector: - matchLabels: - app: argo-server - template: - metadata: - labels: - app: argo-server - spec: - containers: - - args: - - server - - --namespaced - image: #{ARGO-SERVER} - name: argo-server - resources: - limits: - cpu: 150m - memory: 250Mi - ports: - - containerPort: 2746 - name: web - readinessProbe: - httpGet: - path: / - port: 2746 - scheme: HTTP - initialDelaySeconds: 10 - periodSeconds: 20 - nodeSelector: - kubernetes.io/os: linux - serviceAccountName: argo-server ---- -apiVersion: apps/v1 -kind: Deployment metadata: name: workflow-controller namespace: #{AGENT-NAMESPACE} diff --git a/litmus-portal/graphql-server/manifests/namespace/3b_agents_deployment.yaml b/litmus-portal/graphql-server/manifests/namespace/3b_agents_deployment.yaml index 5450dbfe9..882fc8dad 100644 --- a/litmus-portal/graphql-server/manifests/namespace/3b_agents_deployment.yaml +++ b/litmus-portal/graphql-server/manifests/namespace/3b_agents_deployment.yaml @@ -11,7 +11,7 @@ data: AGENT_SCOPE: #{AGENT-SCOPE} IS_CLUSTER_CONFIRMED: "false" COMPONENTS: | - DEPLOYMENTS: ["app=chaos-exporter", "name=chaos-operator", "app=argo-server", "app=event-tracker", "app=workflow-controller"] + DEPLOYMENTS: ["app=chaos-exporter", "name=chaos-operator", "app=event-tracker", "app=workflow-controller"] --- apiVersion: apps/v1 kind: Deployment diff --git a/litmus-portal/graphql-server/pkg/file_handlers/file_handlers.go b/litmus-portal/graphql-server/pkg/file_handlers/file_handlers.go index fcd830d97..3c9b34877 100644 --- a/litmus-portal/graphql-server/pkg/file_handlers/file_handlers.go +++ b/litmus-portal/graphql-server/pkg/file_handlers/file_handlers.go @@ -19,7 +19,6 @@ var subscriberConfiguration = &types.SubscriberConfigurationVars{ AgentScope: os.Getenv("AGENT_SCOPE"), SubscriberImage: os.Getenv("SUBSCRIBER_IMAGE"), EventTrackerImage: os.Getenv("EVENT_TRACKER_IMAGE"), - ArgoServerImage: os.Getenv("ARGO_SERVER_IMAGE"), WorkflowControllerImage: os.Getenv("ARGO_WORKFLOW_CONTROLLER_IMAGE"), ChaosOperatorImage: os.Getenv("LITMUS_CHAOS_OPERATOR_IMAGE"), WorkflowExecutorImage: os.Getenv("ARGO_WORKFLOW_EXECUTOR_IMAGE"), diff --git a/litmus-portal/graphql-server/pkg/types/configurations.go b/litmus-portal/graphql-server/pkg/types/configurations.go index 357bba6ef..83c080c8c 100644 --- a/litmus-portal/graphql-server/pkg/types/configurations.go +++ b/litmus-portal/graphql-server/pkg/types/configurations.go @@ -7,7 +7,6 @@ type SubscriberConfigurationVars struct { GQLServerURI string SubscriberImage string EventTrackerImage string - ArgoServerImage string WorkflowControllerImage string ChaosOperatorImage string WorkflowExecutorImage string diff --git a/litmus-portal/graphql-server/server.go b/litmus-portal/graphql-server/server.go index 7c8bf95cb..41148d627 100644 --- a/litmus-portal/graphql-server/server.go +++ b/litmus-portal/graphql-server/server.go @@ -30,7 +30,7 @@ func init() { log.Printf("Go Version: %s", runtime.Version()) log.Printf("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH) - if os.Getenv("DB_SERVER") == "" || os.Getenv("JWT_SECRET") == "" || os.Getenv("SELF_CLUSTER") == "" || os.Getenv("AGENT_SCOPE") == "" || os.Getenv("AGENT_NAMESPACE") == "" || os.Getenv("LITMUS_PORTAL_NAMESPACE") == "" || os.Getenv("DB_USER") == "" || os.Getenv("DB_PASSWORD") == "" || os.Getenv("PORTAL_SCOPE") == "" || os.Getenv("SUBSCRIBER_IMAGE") == "" || os.Getenv("EVENT_TRACKER_IMAGE") == "" || os.Getenv("ARGO_SERVER_IMAGE") == "" || os.Getenv("ARGO_WORKFLOW_CONTROLLER_IMAGE") == "" || os.Getenv("ARGO_WORKFLOW_EXECUTOR_IMAGE") == "" || os.Getenv("LITMUS_CHAOS_OPERATOR_IMAGE") == "" || os.Getenv("LITMUS_CHAOS_RUNNER_IMAGE") == "" || os.Getenv("LITMUS_CHAOS_EXPORTER_IMAGE") == "" || os.Getenv("CONTAINER_RUNTIME_EXECUTOR") == "" || os.Getenv("HUB_BRANCH_NAME") == "" { + if os.Getenv("DB_SERVER") == "" || os.Getenv("JWT_SECRET") == "" || os.Getenv("SELF_CLUSTER") == "" || os.Getenv("AGENT_SCOPE") == "" || os.Getenv("AGENT_NAMESPACE") == "" || os.Getenv("LITMUS_PORTAL_NAMESPACE") == "" || os.Getenv("DB_USER") == "" || os.Getenv("DB_PASSWORD") == "" || os.Getenv("PORTAL_SCOPE") == "" || os.Getenv("SUBSCRIBER_IMAGE") == "" || os.Getenv("EVENT_TRACKER_IMAGE") == "" || os.Getenv("ARGO_WORKFLOW_CONTROLLER_IMAGE") == "" || os.Getenv("ARGO_WORKFLOW_EXECUTOR_IMAGE") == "" || os.Getenv("LITMUS_CHAOS_OPERATOR_IMAGE") == "" || os.Getenv("LITMUS_CHAOS_RUNNER_IMAGE") == "" || os.Getenv("LITMUS_CHAOS_EXPORTER_IMAGE") == "" || os.Getenv("CONTAINER_RUNTIME_EXECUTOR") == "" || os.Getenv("HUB_BRANCH_NAME") == "" { log.Fatal("Some environment variable are not setup") } } diff --git a/litmus-portal/graphql-server/utils/misc.go b/litmus-portal/graphql-server/utils/misc.go index a1a7eb5a5..7706a0b1c 100644 --- a/litmus-portal/graphql-server/utils/misc.go +++ b/litmus-portal/graphql-server/utils/misc.go @@ -102,7 +102,6 @@ func ManifestParser(cluster dbSchemaCluster.Cluster, rootPath string, subscriber newContent = strings.Replace(newContent, "#{AGENT-NAMESPACE}", AgentNamespace, -1) newContent = strings.Replace(newContent, "#{SUBSCRIBER-SERVICE-ACCOUNT}", ServiceAccountName, -1) newContent = strings.Replace(newContent, "#{AGENT-SCOPE}", cluster.AgentScope, -1) - newContent = strings.Replace(newContent, "#{ARGO-SERVER}", subscriberConfig.ArgoServerImage, -1) newContent = strings.Replace(newContent, "#{ARGO-WORKFLOW-CONTROLLER}", subscriberConfig.WorkflowControllerImage, -1) newContent = strings.Replace(newContent, "#{LITMUS-CHAOS-OPERATOR}", subscriberConfig.ChaosOperatorImage, -1) newContent = strings.Replace(newContent, "#{ARGO-WORKFLOW-EXECUTOR}", subscriberConfig.WorkflowExecutorImage, -1) diff --git a/litmus-portal/namespaced-k8s-template.yml b/litmus-portal/namespaced-k8s-template.yml index ffafc3205..8a2019941 100644 --- a/litmus-portal/namespaced-k8s-template.yml +++ b/litmus-portal/namespaced-k8s-template.yml @@ -156,8 +156,6 @@ spec: value: "litmuschaos/litmusportal-subscriber:ci" - name: EVENT_TRACKER_IMAGE value: "litmuschaos/litmusportal-event-tracker:ci" - - name: ARGO_SERVER_IMAGE - value: "litmuschaos/argocli:v2.9.3" - name: ARGO_WORKFLOW_CONTROLLER_IMAGE value: "litmuschaos/workflow-controller:v2.9.3" - name: ARGO_WORKFLOW_EXECUTOR_IMAGE diff --git a/litmus-portal/platforms/okteto/litmus-portal-dev-manifest-template.yml b/litmus-portal/platforms/okteto/litmus-portal-dev-manifest-template.yml index e18428ba0..ca109f9c3 100644 --- a/litmus-portal/platforms/okteto/litmus-portal-dev-manifest-template.yml +++ b/litmus-portal/platforms/okteto/litmus-portal-dev-manifest-template.yml @@ -148,8 +148,6 @@ spec: value: "litmuschaos/litmusportal-subscriber:ci" - name: EVENT_TRACKER_IMAGE value: "litmuschaos/litmusportal-event-tracker:ci" - - name: ARGO_SERVER_IMAGE - value: "litmuschaos/argocli:v2.9.3" - name: ARGO_WORKFLOW_CONTROLLER_IMAGE value: "litmuschaos/workflow-controller:v2.9.3" - name: ARGO_WORKFLOW_EXECUTOR_IMAGE diff --git a/litmus-portal/run.sh b/litmus-portal/run.sh index 474ef0d4c..f1156fe51 100755 --- a/litmus-portal/run.sh +++ b/litmus-portal/run.sh @@ -12,7 +12,6 @@ export PORTAL_SCOPE=namespace export SUBSCRIBER_IMAGE=litmuschaos/litmusportal-subscriber:ci export EVENT_TRACKER_IMAGE=litmuschaos/litmusportal-event-tracker:ci export CONTAINER_RUNTIME_EXECUTOR=k8sapi -export ARGO_SERVER_IMAGE=argoproj/argocli:v2.9.3 export ARGO_WORKFLOW_CONTROLLER_IMAGE=argoproj/workflow-controller:v2.9.3 export ARGO_WORKFLOW_EXECUTOR_IMAGE=argoproj/argoexec:v2.9.3 export LITMUS_CHAOS_OPERATOR_IMAGE=litmuschaos/chaos-operator:1.13.5