feature-creeps · lieberlois · Apr 14, 2023 · Mar 8, 2023 · Mar 8, 2023 · Mar 8, 2023
diff --git a/local/application/values.yaml b/local/application/values.yaml
@@ -9,7 +9,7 @@ local: &localConfig
 
 global:
   tracing:
-    url: http://zipkin.istio-system:9411
+    endpoint: http://zipkin.istio-system:9411/api/v2/spans
 
 dima-frontend:
   image:

diff --git a/local/kubernetes/10_build_dima.sh b/local/kubernetes/10_build_dima.sh
@@ -1,9 +1,24 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-export GKE_REGISTRY=local
+script_dir="$(dirname "$0")"
 
-GITHUB_SHA="$(git rev-parse --short HEAD)-snapshot"
-export GITHUB_SHA
+image_prefix="local/dima-"
+image_tag="$(git rev-parse --short HEAD)-snapshot"
 
-docker compose -f ../../stack/compose/docker-compose.yml -f ../../stack/compose/docker-compose-registry-tags.yml build --parallel
+services=(
+  "imageorchestrator"
+  "imageholder"
+  "imagerotator"
+  "imagegrayscale"
+  "imageresize"
+  "imageflip"
+  "imagethumbnail"
+  "trafficgen"
+)
+
+for service in "${services[@]}"; do
+  docker build "${script_dir}/../../stack/application/" --build-arg "SERVICE=$service"  -t "${image_prefix}${service}:${image_tag}"
+done
+
+docker build "${script_dir}/../../stack/application/frontend/" -t "${image_prefix}frontend:${image_tag}"
diff --git a/local/kubernetes/22b_deploy_logging_elastic.sh b/local/kubernetes/22b_deploy_logging_elastic.sh
@@ -3,6 +3,7 @@ set -euo pipefail
 
 NAMESPACE=logging
 ELASTIC_VERSION="7.17.3"
+FLUENTD_VERSION="0.4.3"
 
 echo "=== Deploy logging stack in namespace ${NAMESPACE}"
 
@@ -22,7 +23,7 @@ echo "--- install curator"
 helm upgrade --install -n "$NAMESPACE" -f tools/logging/curator.yaml elasticsearch-curator lebenitza/elasticsearch-curator
 
 echo "--- install fluentd"
-helm upgrade --install -n "$NAMESPACE" -f tools/logging/fluentd.yaml fluentd fluent/fluentd
+helm upgrade --install -n "$NAMESPACE" -f tools/logging/fluentd.yaml fluentd fluent/fluentd --version ${FLUENTD_VERSION}
 
 echo "--- install kibana"
 helm upgrade --install -n "$NAMESPACE" -f tools/logging/kibana.yaml --version ${ELASTIC_VERSION} kibana elastic/kibana

diff --git a/local/kubernetes/infrastructure/service-ingress.yaml b/local/kubernetes/infrastructure/service-ingress.yaml
@@ -9,7 +9,8 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-  - http:
+  - host: localhost
+    http:
       paths:
       - path: "/prometheus/?(.*)"
         pathType: ImplementationSpecific
@@ -29,7 +30,8 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-  - http:
+  - host: localhost
+    http:
       paths:
       - path: "/grafana/?(.*)"
         pathType: ImplementationSpecific
@@ -49,7 +51,8 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - http:
+    - host: localhost
+      http:
         paths:
           - path: "/jaeger/?(.*)"
             pathType: ImplementationSpecific
@@ -70,7 +73,8 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - http:
+    - host: localhost
+      http:
         paths:
           - path: "/kibana/?(.*)"
             pathType: ImplementationSpecific

diff --git a/local/kubernetes/tools/istio/kiali.yaml b/local/kubernetes/tools/istio/kiali.yaml
@@ -10,6 +10,7 @@ deployment:
       metadata:
         annotations:
           nginx.ingress.kubernetes.io/rewrite-target: /$1
+          nginx.ingress.kubernetes.io/use-regex: "true"
       spec:
         ingressClassName: nginx
         rules:
@@ -21,7 +22,7 @@ deployment:
                       port:
                         number: 20001
                   path: /(.*)
-                  pathType: Prefix
+                  pathType: ImplementationSpecific
   pod_annotations:
     prometheus.io/scrape: "true"
     prometheus.io/port: "9090"

diff --git a/local/kubernetes/tools/logging/curator.yaml b/local/kubernetes/tools/logging/curator.yaml
@@ -1,4 +1,7 @@
 ---
+image:
+  repository: bitnami/elasticsearch-curator-archived
+
 configMaps:
   action_file_yml: |-
     ---
@@ -20,7 +23,7 @@ configMaps:
           unit_count: 3
         - filtertype: pattern
           kind: regex
-          value: '^[^\.].*'    
+          value: '^[^\.].*'
   config_yml: |-
     ---
     client:
@@ -44,4 +47,4 @@ configMaps:
       loglevel: INFO
       logfile:
       logformat: default
-      blacklist: [‘elasticsearch’]
+      blacklist: ['elasticsearch']
diff --git a/local/kubernetes/tools/logging/elasticsearch.yaml b/local/kubernetes/tools/logging/elasticsearch.yaml
@@ -1,20 +1,27 @@
 ---
 replicas: 1
+
+esJavaOpts: "-Xms512m -Xmx512m"
+
 resources:
   requests:
     cpu: "250m"
-    memory: "1000Mi"
+    memory: "1Gi"
   limits:
     cpu: "500m"
-    memory: "1500Mi"
+    memory: "2Gi"
+
 secret:
   enabled: true
   password: "changeme"
+
 clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s"
+
 volumeClaimTemplate:
   resources:
     requests:
       storage: 10Gi
+
 lifecycle:
   postStart:
     exec:

diff --git a/local/kubernetes/tools/logging/fluentd.yaml b/local/kubernetes/tools/logging/fluentd.yaml
@@ -35,6 +35,12 @@ fileConfigs:
       </parse>
       emit_unmatched_lines true
     </source>
+    <source>
+      @type prometheus
+      bind 0.0.0.0
+      port 24231
+      metrics_path /metrics
+    </source>
   02_filters.conf: |-
     <label @KUBERNETES>
       <match kubernetes.var.log.containers.fluentd**>

diff --git a/local/kubernetes/tools/logging/kibana-index/build_deploy.sh b/local/kubernetes/tools/logging/kibana-index/build_deploy.sh
@@ -4,9 +4,10 @@ set -euo pipefail
 dir="$(dirname "$0")"
 namespace="$1"
 
-TAG="gcr.io/olly-2021-k8s-migration/kibana-index:latest"
+CLUSTER_NAME=o11y-stack
+TAG="local/kibana-index:latest"
 
 docker build "$dir" -t "$TAG"
-docker push "$TAG"
+k3d image import -c "$CLUSTER_NAME" "$TAG"
 
 kubectl apply -n "$namespace" -f "$dir/job.yaml"
diff --git a/local/kubernetes/tools/logging/kibana-index/job.yaml b/local/kubernetes/tools/logging/kibana-index/job.yaml
@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
         - name: kibana-index
-          image: gcr.io/olly-2021-k8s-migration/kibana-index:latest
-          imagePullPolicy: Always
+          image: local/kibana-index:latest
+          imagePullPolicy: Never  # Imported via k3d image import
       restartPolicy: OnFailure
   backoffLimit: 4
diff --git a/stack/application/Dockerfile b/stack/application/Dockerfile
@@ -1,28 +1,28 @@
-FROM gradle:7.6-jdk17-alpine AS builder
+FROM eclipse-temurin:17.0.8.1_1-jdk-jammy AS builder
 
 WORKDIR /build
 
-ARG ELASTIC_APM_AGENT_VERSION=1.36.0
+ARG ELASTIC_APM_AGENT_VERSION=1.43.0
 
 # apm
-RUN wget https://search.maven.org/remotecontent?filepath=co/elastic/apm/elastic-apm-agent/${ELASTIC_APM_AGENT_VERSION}/elastic-apm-agent-${ELASTIC_APM_AGENT_VERSION}.jar -O /elastic-apm-agent.jar
+RUN wget -q https://search.maven.org/remotecontent?filepath=co/elastic/apm/elastic-apm-agent/${ELASTIC_APM_AGENT_VERSION}/elastic-apm-agent-${ELASTIC_APM_AGENT_VERSION}.jar -O /elastic-apm-agent.jar
 
 # gradle cache
-COPY build.gradle build.gradle
-COPY settings.gradle settings.gradle
-RUN gradle resolveDependencies
+COPY ["gradle/", "./gradle"]
+COPY ["build.gradle", "settings.gradle", "gradlew", "./"]
+RUN ./gradlew resolveDependencies
 
 # libs
 COPY springevents springevents
-RUN gradle springevents:build
+RUN ./gradlew springevents:build
 
 # service build
 ARG SERVICE
 COPY $SERVICE $SERVICE
 
-RUN gradle $SERVICE:build
+RUN ./gradlew "$SERVICE:build"
 
-FROM eclipse-temurin:17.0.6_10-jre AS final
+FROM eclipse-temurin:17.0.8.1_1-jre-jammy AS final
 ARG SERVICE
 
 COPY --from=builder /elastic-apm-agent.jar /
@@ -34,4 +34,4 @@ RUN chmod +x /entrypoint.sh
 ENV SERVICE=$SERVICE
 
 EXPOSE 8080 5005
-ENTRYPOINT /entrypoint.sh $SERVICE
+ENTRYPOINT ["/entrypoint.sh"]