litmuschaos
/
litmus
mirror of https://github.com/litmuschaos/litmus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removing Argo server deployment from the agent list (#2893) 

* Removin Argo server deployment from the agent list

Signed-off-by: Raj Das <raj@chaosnative.com>

* Removing Argo server env from the okteto manifest

Signed-off-by: Raj Das <raj@chaosnative.com>

* removing argoserver from agent-config

Signed-off-by: Raj Das <raj@chaosnative.com>
This commit is contained in:
Raj Babu Das 2021-06-15 09:42:56 +05:30 committed by GitHub
parent 673a368454
commit fe709ecadd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 3 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
litmus-portal/cluster-k8s-manifest.yml
View File

@ -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

65
litmus-portal/graphql-server/manifests/cluster/1b_argo_rbac.yaml
View File

@ -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}

46
litmus-portal/graphql-server/manifests/cluster/1d_argo_deployment.yaml
View File

@ -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}

2
litmus-portal/graphql-server/manifests/cluster/3b_agents_deployment.yaml
View File

@ -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

82
litmus-portal/graphql-server/manifests/namespace/1a_argo_rbac.yaml
View File

@ -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}

51
litmus-portal/graphql-server/manifests/namespace/1c_argo_deployment.yaml
View File

@ -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}

2
litmus-portal/graphql-server/manifests/namespace/3b_agents_deployment.yaml
View File

@ -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

1
litmus-portal/graphql-server/pkg/file_handlers/file_handlers.go
View File

@ -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"),

1
litmus-portal/graphql-server/pkg/types/configurations.go
View File

@ -7,7 +7,6 @@ type SubscriberConfigurationVars struct {
GQLServerURI string
SubscriberImage string
EventTrackerImage string
ArgoServerImage string
WorkflowControllerImage string
ChaosOperatorImage string
WorkflowExecutorImage string

2
litmus-portal/graphql-server/server.go
View File

@ -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")
}
}

1
litmus-portal/graphql-server/utils/misc.go
View File

@ -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)

2
litmus-portal/namespaced-k8s-template.yml
View File

@ -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

2
litmus-portal/platforms/okteto/litmus-portal-dev-manifest-template.yml
View File

@ -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

1
litmus-portal/run.sh
View File

@ -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