提交 cee250ef 编辑于 作者: wangjiaju's avatar wangjiaju
浏览文件

update source code.

上级 b313386b

helm-chart/templates/adservice.yaml

+10 −6
原始行号 差异行号 差异行
@@ -22,7 +22,7 @@ spec: 
    matchLabels:

      app: adservice

      version: "1"

  replicas: 3

  replicas: {{ .Values.replicas.adservice }}

  template:

    metadata:

      labels:
@@ -45,7 +45,7 @@ spec: 
        # - name: DISABLE_TRACING

        #   value: "1"

        - name: JAEGER_HOST

          value: "jaeger-collector.observability.svc.cluster.local"

          value: "jaeger-collector.observe.svc.cluster.local"

        - name: ZIPKIN_PORT

          value: "9411"

          # value: "14268"
@@ -61,21 +61,25 @@ spec: 
          valueFrom:

            fieldRef:

              fieldPath: spec.nodeName

        - name: NAMESPACE

          valueFrom:

            fieldRef:

              fieldPath: metadata.namespace

        - name: SERVICE_NAME

          value: "adservice"

        - name: MYSQL_ADDR

          value: "223.193.36.169:4000"

          value: "223.193.36.56:32187"

        - name: SQL_USER

          value: "root"

        - name: SQL_PASSWORD

          value: "123456"

          value: "Aiops@2024"

        resources:

          requests:

            cpu: 400m

            memory: 360Mi

            memory: 800Mi

          limits:

            cpu: 600m

            memory: 600Mi

            memory: 800Mi

        #readinessProbe:

        #  initialDelaySeconds: 20

        #  periodSeconds: 15

helm-chart/templates/cartservice.yaml

+6 −4
原始行号 差异行号 差异行
@@ -22,7 +22,7 @@ spec: 
    matchLabels:

      app: cartservice

      version: "1"

  replicas: 3

  replicas: {{ .Values.replicas.cartservice }}

  template:

    metadata:

      labels:
@@ -49,7 +49,7 @@ spec: 
        - name: HIPSTER_SICK # Used for GCP demo

          value: "false"

        - name: JAEGER_HOST

          value: "jaeger-collector.observability.svc.cluster.local"

          value: "jaeger-collector.observe.svc.cluster.local"

        - name: JAEGER_PORT

          value: "4317"

        - name: POD_IP
@@ -64,8 +64,10 @@ spec: 
          valueFrom:

            fieldRef:

              fieldPath: spec.nodeName

        - name: TINGYUN_LICENSE_KEY

          value: "aJvUQ0IMBRBEotyK"

        - name: NAMESPACE

          valueFrom:

            fieldRef:

              fieldPath: metadata.namespace

        resources:

          requests:

            cpu: 400m

helm-chart/templates/checkoutservice.yaml

+6 −2
原始行号 差异行号 差异行
@@ -23,7 +23,7 @@ spec: 
    matchLabels:

      app: checkoutservice

      version: "1"

  replicas: 3

  replicas: {{ .Values.replicas.checkoutservice }}

  template:

    metadata:

      labels:
@@ -74,10 +74,14 @@ spec: 
            valueFrom:

              fieldRef:

                fieldPath: spec.nodeName

          - name: NAMESPACE

            valueFrom:

              fieldRef:

                fieldPath: metadata.namespace

          - name: DISABLE_PROFILER

            value: "1"

          - name: JAEGER_SERVICE_ADDR

            value: "jaeger-collector.observability.svc.cluster.local:14268/api/traces"

            value: "jaeger-collector.observe.svc.cluster.local:14268/api/traces"

          - name: SERVICE_NAME

            value: "checkoutservice"

          resources:

helm-chart/templates/currencyservice.yaml

+10 −2
原始行号 差异行号 差异行
@@ -22,7 +22,11 @@ spec: 
    matchLabels:

      app: currencyservice

      version: "1"

<<<<<<< HEAD

  replicas: 3

=======

  replicas: {{ .Values.replicas.currencyservice }}

>>>>>>> 7359736 (update source code.)

  template:

    metadata:

      labels:
@@ -33,7 +37,7 @@ spec: 
      terminationGracePeriodSeconds: 5

      containers:

      - name: server

        image: {{ .Values.images.repository }}/{{ .Values.currencyService.name }}:0.0.2 

        image: {{ .Values.images.repository }}/{{ .Values.currencyService.name }}:{{ .Values.images.tag }}

        imagePullPolicy: Always

        ports:

        - name: grpc
@@ -46,7 +50,7 @@ spec: 
        - name: PORT

          value: "7000"

        - name: JAEGER_HOST

          value: "jaeger-collector.observability.svc.cluster.local"

          value: "jaeger-collector.observe.svc.cluster.local"

            #valueFrom:

            #fieldRef:

            #fieldPath: status.hostIP
@@ -69,6 +73,10 @@ spec: 
          valueFrom:

            fieldRef:

              fieldPath: spec.nodeName

        - name: NAMESPACE

          valueFrom:

            fieldRef:

              fieldPath: metadata.namespace

        #readinessProbe:

        #  exec:

        #    command: ["/bin/grpc_health_probe", "-addr=:7000"]

helm-chart/templates/emailservice.yaml

+6 −2
原始行号 差异行号 差异行
@@ -23,7 +23,7 @@ spec: 
    matchLabels:

      app: emailservice

      version: "1"

  replicas: 3

  replicas: {{ .Values.replicas.emailservice }}

  template:

    metadata:

      labels:
@@ -49,7 +49,7 @@ spec: 
          value: "1"

        - name: JAEGER_HOST

          # value: "jaeger-collector"

          value: "jaeger-collector.observability.svc.cluster.local"

          value: "jaeger-collector.observe.svc.cluster.local"

        - name: JAEGER_PORT

          value: "14268"

        - name: SERVICE_NAME
@@ -66,6 +66,10 @@ spec: 
          valueFrom:

            fieldRef:

              fieldPath: spec.nodeName

        - name: NAMESPACE

          valueFrom:

            fieldRef:

              fieldPath: metadata.namespace

        #readinessProbe:

        #  periodSeconds: 5

        #  exec: