Skip to content

Commit

Permalink
Merge pull request #188 from seungkyua/20231019_byoh_msa
Browse files Browse the repository at this point in the history
fix msa
  • Loading branch information
seungkyua authored Oct 20, 2023
2 parents e0f0944 + d6bacc8 commit 5d56580
Show file tree
Hide file tree
Showing 3 changed files with 268 additions and 35 deletions.
49 changes: 44 additions & 5 deletions aws-msa-reference/service-mesh/site-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,47 @@ global:

charts:
- name: cert-manager
override: {}
override:
image:
repository: harbor.taco-cat.xyz/tks/cert-manager-controller
nodeSelector:
tks-msa: enabled
webhook:
image:
repository: harbor.taco-cat.xyz/tks/cert-manager-webhook
nodeSelector:
tks-msa: enabled
cainjector:
image:
repository: harbor.taco-cat.xyz/tks/cert-manager-cainjector
nodeSelector:
tks-msa: enabled

- name: k8ssandra-operator
override: {}
override:
image:
registry: harbor.taco-cat.xyz
repository: tks/k8ssandra-operator
tag: v1.6.0
nodeSelector:
tks-msa: enabled
cleaner:
image:
registry: harbor.taco-cat.xyz
repository: tks/k8ssandra-tools
tag: latest
client:
image:
registry: harbor.taco-cat.xyz
repository: tks/k8ssandra-tools
tag: latest
cass-operator:
image:
registry: harbor.taco-cat.xyz
repository: tks/cass-operator
tag: v1.14.0
nodeSelector:
tks-msa: enabled

- name: servicemesh-k8ssandra-resource
override:
Expand Down Expand Up @@ -63,7 +100,7 @@ charts:
- name: istio-ingressgateway
override:
revision: ""
replicaCount: 2
replicaCount: 1
autoscaling:
enabled: false
minReplicas: 1
Expand Down Expand Up @@ -113,10 +150,12 @@ charts:
- enabled
storage:
type: cassandra
cassandra:
options:
options:
cassandra:
servers: cassandra-dc-service.tks-msa.svc
keyspace: jaeger_v1_datacenter
cassandraCreateSchema:
image: harbor.taco-cat.xyz/tks/jaeger-cassandra-schema:1.35.0
dependencies:
enabled: true
image: harbor.taco-cat.xyz/tks/spark-dependencies:1.35.0
Expand Down
205 changes: 180 additions & 25 deletions byoh-reference/service-mesh/site-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,58 +5,213 @@ metadata:

global:
clusterName: cluster.local
namespace: tks-msa
imageRepo: harbor.taco-cat.xyz/tks
serviceMeshControlNodeSelector:
servicemesh: enabled
tks-msa: enabled
serviceMeshIngressNodeSelector:
taco-ingress-gateway: enabled
tks-ingressgateway: enabled
serviceMeshEgressNodeSelector:
taco-egress-gateway: enabled
ingressGatewayLabel: istio-ingress-gateway
egressGatewayLabel: istio-egress-gateway
tks-egressgateway: enabled
ingressGatewayLabel: istio-ingressgateway
egressGatewayLabel: istio-egressgateway

charts:
- name: cert-manager
override:
image:
repository: harbor.taco-cat.xyz/tks/cert-manager-controller
nodeSelector:
tks-msa: enabled
webhook:
image:
repository: harbor.taco-cat.xyz/tks/cert-manager-webhook
nodeSelector:
tks-msa: enabled
cainjector:
image:
repository: harbor.taco-cat.xyz/tks/cert-manager-cainjector
nodeSelector:
tks-msa: enabled

- name: k8ssandra-operator
override:
image:
registry: harbor.taco-cat.xyz
repository: tks/k8ssandra-operator
tag: v1.6.0
nodeSelector:
tks-msa: enabled
cleaner:
image:
registry: harbor.taco-cat.xyz
repository: tks/k8ssandra-tools
tag: latest
client:
image:
registry: harbor.taco-cat.xyz
repository: tks/k8ssandra-tools
tag: latest
cass-operator:
image:
registry: harbor.taco-cat.xyz
repository: tks/cass-operator
tag: v1.14.0
nodeSelector:
tks-msa: enabled

- name: servicemesh-k8ssandra-resource
override:
namespace: $(namespace)
cassandra:
datacenters:
size: 2
config:
heapSize: 2048M
storageConfig:
storageClassName: taco-storage
accessModes: ReadWriteOnce
size: 300Gi
racks:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: tks-msa
operator: In
values:
- enabled
stargate:
size: 1
heapSize: 384M
nodeSelector:
tks-msa: enabled

- name: istiod
override:
revision: ""
pilot.autoscaleEnabled: false
pilot.traceSampling: 1.0
pilot.nodeSelector: $(serviceMeshControlNodeSelector)
global.proxy.clusterDomain: $(clusterName)
global.tracer.zipkin.address: jaeger-operator-jaeger-collector.$(namespace):9411

- name: istio-ingress-gateway
- name: istio-ingressgateway
override:
revision: ""
replicaCount: 1
service.type: LoadBalancer
resources.requests.cpu: 1000m
resources.requests.memory: 1024Mi
resources.limits.cpu: 2000m
resources.limits.memory: 2048Mi
autoscaling:
enabled: false
minReplicas: 1
maxReplicas: 5
targetCPUUtilizationPercentage: 80
service.type: NodePort
#resources.requests.cpu: 1000m
#resources.requests.memory: 1024Mi
#resources.limits.cpu: 2000m
#resources.limits.memory: 2048Mi
nodeSelector: $(serviceMeshIngressNodeSelector)

- name: istio-egressgateway
override:
revision: ""
replicaCount: 1
autoscaling.enabled: false
service.type: ClusterIP
#resources.requests.cpu: 1000m
#resources.requests.memory: 1024Mi
#resources.limits.cpu: 2000m
#resources.limits.memory: 2048Mi
nodeSelector: $(serviceMeshEgressNodeSelector)

- name: jaeger-operator
override: {}
override:
nodeSelector: $(serviceMeshControlNodeSelector)

- name: servicemesh-jaeger-resource
override:
namespace: tks-msa
sampling.param: 100
storage.options.es:
serverUrls: https://eck-elasticsearch-es-http.lma.svc:9200
username: taco-fluentbit
password: tacoword
elasticsearch:
host: eck-elasticsearch-es-http.lma.svc.$(clusterName)
collector.resources.requests.cpu: 500m
collector.resources.requests.memory: 1024Mi
collector.resources.limits.cpu: 1000m
collector.resources.limits.memory: 2048Mi
collector:
image: harbor.taco-cat.xyz/tks/jaeger-collector:1.35.0
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: tks-msa
operator: In
values:
- enabled
storage:
type: cassandra
options:
cassandra:
servers: cassandra-dc-service.tks-msa.svc
keyspace: jaeger_v1_datacenter
cassandraCreateSchema:
image: harbor.taco-cat.xyz/tks/jaeger-cassandra-schema:1.35.0
dependencies:
enabled: true
image: harbor.taco-cat.xyz/tks/spark-dependencies:1.35.0
query:
image: harbor.taco-cat.xyz/tks/jaeger-query:1.35.0
basePath: /
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: tks-msa
operator: In
values:
- enabled
agent:
image: harbor.taco-cat.xyz/tks/jaeger-agent:1.35.0
cassandra:
user:
enabled: false
username: taco-jaeger
password: tacoword
query.basePath: /jaeger
enabled: true
username: tks
password: tksword
nodeSelector:
tks-msa: enabled
elasticsearch.user.enabled: false

- name: kiali-operator
override: {}
override:
image:
repo: harbor.taco-cat.xyz/tks/kiali-operator
tag: v1.63.0
nodeSelector: $(serviceMeshControlNodeSelector)

- name: servicemesh-kiali-resource
override:
namespace: tks-msa
istioNamespace: tks-msa
deployment.namespace: tks-msa
deployment.image_name: harbor.taco-cat.xyz/tks/kiali
deployment.image_version: v1.63.0
deployment.resources.requests.cpu: 500m
deployment.resources.requests.memory: 512Mi
deployment.resources.limits.cpu: 1000m
deployment.resources.limits.memory: 1024Mi
deployment.nodeSelector:
tks-msa: enabled
auth.strategy: anonymous
externalServices.istio.configMapName: istio
externalServices.istio.istioIdentityDomain: svc.$(clusterName)
externalServices.prometheus.url: http://lma-prometheus.lma.svc:9090
externalServices.tracing.inClusterUrl: http://jaeger-operator-jaeger-query.istio-system:16686
externalServices.tracing.inClusterUrl: http://jaeger-operator-jaeger-query.tks-msa:16686
externalServices.tracing.url: https://jaeger-v2.taco-cat.xyz
externalServices.tracing.useGrpc: false
externalServices.grafana.auth.type: basic
externalServices.grafana.auth.username: admin
externalServices.grafana.auth.password: password
externalServices.grafana.inClusterUrl: http://grafana.lma.svc:80
externalServices.grafana.url: https://grafana-v2.taco-cat.xyz
server.webRoot: /kiali
server.webRoot: /
49 changes: 44 additions & 5 deletions eks-msa-reference/service-mesh/site-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,47 @@ global:

charts:
- name: cert-manager
override: {}
override:
image:
repository: harbor.taco-cat.xyz/tks/cert-manager-controller
nodeSelector:
tks-msa: enabled
webhook:
image:
repository: harbor.taco-cat.xyz/tks/cert-manager-webhook
nodeSelector:
tks-msa: enabled
cainjector:
image:
repository: harbor.taco-cat.xyz/tks/cert-manager-cainjector
nodeSelector:
tks-msa: enabled

- name: k8ssandra-operator
override: {}
override:
image:
registry: harbor.taco-cat.xyz
repository: tks/k8ssandra-operator
tag: v1.6.0
nodeSelector:
tks-msa: enabled
cleaner:
image:
registry: harbor.taco-cat.xyz
repository: tks/k8ssandra-tools
tag: latest
client:
image:
registry: harbor.taco-cat.xyz
repository: tks/k8ssandra-tools
tag: latest
cass-operator:
image:
registry: harbor.taco-cat.xyz
repository: tks/cass-operator
tag: v1.14.0
nodeSelector:
tks-msa: enabled

- name: servicemesh-k8ssandra-resource
override:
Expand Down Expand Up @@ -63,7 +100,7 @@ charts:
- name: istio-ingressgateway
override:
revision: ""
replicaCount: 2
replicaCount: 1
autoscaling:
enabled: false
minReplicas: 1
Expand Down Expand Up @@ -113,10 +150,12 @@ charts:
- enabled
storage:
type: cassandra
cassandra:
options:
options:
cassandra:
servers: cassandra-dc-service.tks-msa.svc
keyspace: jaeger_v1_datacenter
cassandraCreateSchema:
image: harbor.taco-cat.xyz/tks/jaeger-cassandra-schema:1.35.0
dependencies:
enabled: true
image: harbor.taco-cat.xyz/tks/spark-dependencies:1.35.0
Expand Down

0 comments on commit 5d56580

Please sign in to comment.