Upgrade otel to v0.93.0 and other upgrades (#3208)

- **Chores** - Updated cache keys and base images for various components to improve performance and maintain consistency.
fluxninja · Feb 5, 2024 · 9a43d24 · 9a43d24
1 parent e668f67
commit 9a43d24
Show file tree

Hide file tree

Showing 12 changed files with 1,012 additions and 1,026 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -86,10 +86,10 @@ commands:
       - restore_cache:
           name: Restore ASDF cache
           keys:
-            - aperture-asdf-cache-v13-{{ checksum "~/month" }}-<<
+            - aperture-asdf-cache-v14-{{ checksum "~/month" }}-<<
               parameters.cache_name >>-{{ checksum ".tool-versions" }}-{{
               checksum "go.mod" }}
-            - aperture-asdf-cache-v13-{{ checksum "~/month" }}-<<
+            - aperture-asdf-cache-v14-{{ checksum "~/month" }}-<<
               parameters.cache_name >>-
       - run:
           name: Copy tool-versions in HOME dir
@@ -111,7 +111,7 @@ commands:
       - save_cache:
           name: Save ASDF cache
           key:
-            aperture-asdf-cache-v13-{{ checksum "~/month" }}-<<
+            aperture-asdf-cache-v14-{{ checksum "~/month" }}-<<
             parameters.cache_name >>-{{ checksum ".tool-versions" }}-{{ checksum
             "go.mod" }}
           paths:

diff --git a/.circleci/continue-workflows.yml b/.circleci/continue-workflows.yml
@@ -10,7 +10,7 @@ executors:
       - image: cimg/base:2022.07
   go-cimg-executor:
     docker:
-      - image: cimg/go:1.21.5
+      - image: cimg/go:1.21.6
         user: root
   python-cimg-executor:
     docker:
@@ -344,7 +344,7 @@ jobs:
       - restore_cache:
           name: Restore daily cache
           keys:
-            - aperture-v11-daily-cache-{{ checksum "~/day" }}
+            - aperture-v12-daily-cache-{{ checksum "~/day" }}
       - run: &install_opsninja
           name: Install opsninja and its dependencies
           command: |
@@ -425,7 +425,7 @@ jobs:
             fi
       - save_cache:
           name: Save daily cache
-          key: aperture-v11-daily-cache-{{ checksum "~/day" }}
+          key: aperture-v12-daily-cache-{{ checksum "~/day" }}
           paths:
             - ../.cache/go-build
             - ../.cache/golangci-lint
@@ -1106,7 +1106,7 @@ jobs:
       - restore_cache:
           name: Restore go cache
           keys:
-            - aperture-v4-go-cache-upload-policies
+            - aperture-v5-go-cache-upload-policies
       - run:
           name: Apply Policy
           working_directory: .
@@ -1115,7 +1115,7 @@ jobs:
             --controller << parameters.controller-endpoint >> --api-key ${CONTROLLER_API_KEY} --project-name latest-dev -f -s
       - save_cache:
           name: Save go cache
-          key: aperture-v4-go-cache-upload-policies
+          key: aperture-v5-go-cache-upload-policies
           paths:
             - ../.cache/go-build
             - ./blueprints/vendor
@@ -1603,10 +1603,10 @@ commands:
       - restore_cache:
           name: Restore ASDF cache
           keys:
-            - aperture-asdf-cache-v13-{{ checksum "~/month" }}-<<
+            - aperture-asdf-cache-v14-{{ checksum "~/month" }}-<<
               parameters.cache_name >>-{{ checksum ".tool-versions" }}-{{
               checksum "tools/go/go.mod" }}
-            - aperture-asdf-cache-v13-{{ checksum "~/month" }}-<<
+            - aperture-asdf-cache-v14-{{ checksum "~/month" }}-<<
               parameters.cache_name >>-
       - run:
           name: Copy tool-versions in HOME dir
@@ -1627,7 +1627,7 @@ commands:
     steps:
       - save_cache:
           name: Save ASDF cache
-          key: aperture-asdf-cache-v13-{{ checksum "~/month" }}-<<
+          key: aperture-asdf-cache-v14-{{ checksum "~/month" }}-<<
             parameters.cache_name >>-{{ checksum ".tool-versions" }}-{{ checksum
             "tools/go/go.mod" }}
           paths:

diff --git a/.tool-versions b/.tool-versions
@@ -2,7 +2,7 @@ pre-commit 3.3.1
 bats 1.9.0
 python 3.11.4
 gcloud 429.0.0
-golang 1.21.5
+golang 1.21.6
 golangci-lint 1.55.0
 grpcurl 1.8.7
 mockery 2.26.1

diff --git a/cmd/aperture-agent/Dockerfile b/cmd/aperture-agent/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.4
-FROM golang:1.21.5-bullseye AS builder
+FROM golang:1.21.6-bullseye AS builder
 
 WORKDIR /src
 COPY --link . .
@@ -15,8 +15,8 @@ ARG APERTURECTL_BUILD_FLAGS
 ENV APERTURECTL_BUILD_FLAGS=${APERTURECTL_BUILD_FLAGS}
 
 RUN --mount=type=cache,target=/go/pkg/ \
-  --mount=type=cache,target=/root/.cache/go-build/,id=agent-1.21.5,sharing=private \
-  --mount=type=cache,target=/root/.aperturectl,id=agent-1.21.5,sharing=private \
+  --mount=type=cache,target=/root/.cache/go-build/,id=agent-1.21.6,sharing=private \
+  --mount=type=cache,target=/root/.aperturectl,id=agent-1.21.6,sharing=private \
   /bin/bash -c \
   'set -eu; \
   go mod download; \

diff --git a/cmd/aperture-controller/Dockerfile b/cmd/aperture-controller/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.4
-FROM golang:1.21.5-bullseye AS builder
+FROM golang:1.21.6-bullseye AS builder
 
 WORKDIR /src
 COPY --link . .
@@ -15,8 +15,8 @@ ARG APERTURECTL_BUILD_FLAGS
 ENV APERTURECTL_BUILD_FLAGS=${APERTURECTL_BUILD_FLAGS}
 
 RUN --mount=type=cache,target=/go/pkg/ \
-  --mount=type=cache,target=/root/.cache/go-build/,id=controller-1.21.5,sharing=private \
-  --mount=type=cache,target=/root/.aperturectl,id=controller-1.21.5,sharing=private \
+  --mount=type=cache,target=/root/.cache/go-build/,id=controller-1.21.6,sharing=private \
+  --mount=type=cache,target=/root/.aperturectl,id=controller-1.21.6,sharing=private \
   /bin/bash -c \
   'go mod download; \
   ./scripts/build_aperturectl.sh ./cmd/aperturectl; \