Skip to content

Commit 663f4de

Browse files
Kausik-Avasireddy99
Kausik-A
and
vasireddy99
authored
Merging Release/v0.46.x branch back to terraform branch (#1818)
* Fix EKS containerd expected templates * Fix the Dockerfile for mocked-server * Remove EOL EC2 AMIs from CI test matrix nad fix flaky image builds (#1815) * Remove EOL AMIs * fix flaky image builds * add option for bigger runner * Update mocked server ca-bundle.crt with new certificate * run make update-certs * Fix Kafka test configs for OTel Collector v0.141.0 breaking changes * Update Helm chart to 0.100.0 for operator 0.141.x support --------- Co-authored-by: Vasi Vasireddy <[email protected]> Co-authored-by: Vasi Vasireddy <[email protected]>
1 parent 5aa393d commit 663f4de

File tree

26 files changed

+172
-257
lines changed

26 files changed

+172
-257
lines changed

‎.github/workflows/update-test-images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ permissions:
1919

2020
jobs:
2121
run-image-build:
22-
runs-on: ubuntu-latest
22+
runs-on: ${{ vars.RUNNER_TYPE || 'ubuntu-latest' }}
2323
steps:
2424
- name: Remove cache
2525
run: rm -rf /opt/hostedtoolcache

‎mocked_servers/grpc_metrics/Dockerfile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
FROM golang:1.23 AS build
1+
FROM --platform=$BUILDPLATFORM golang:1.23 AS build
2+
ARG TARGETARCH
23
WORKDIR $GOPATH/main
34
COPY . .
4-
RUN go env -w GOPROXY=direct
5-
# Retry logic for go mod download to handle transient network issues
6-
RUN for i in 1 2 3; do GO111MODULE=on go mod download && break || sleep 5; done
7-
RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build -o=/bin/main .
5+
6+
RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -o=/bin/main .
87

98
FROM scratch
109
COPY --from=build /bin/main /bin/main

‎mocked_servers/grpc_trace/Dockerfile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
FROM golang:1.23 AS build
1+
FROM --platform=$BUILDPLATFORM golang:1.23 AS build
2+
ARG TARGETARCH
23
WORKDIR $GOPATH/main
34
COPY . .
4-
RUN go env -w GOPROXY=direct
5-
# Retry logic for go mod download to handle transient network issues
6-
RUN for i in 1 2 3; do GO111MODULE=on go mod download && break || sleep 5; done
7-
RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build -o=/bin/main .
5+
6+
RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -o=/bin/main .
87

98
FROM scratch
109
COPY --from=build /bin/main /bin/main

‎mocked_servers/https/Dockerfile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
FROM golang:1.23 AS build
1+
FROM --platform=$BUILDPLATFORM golang:1.23 AS build
2+
ARG TARGETARCH
23

34
# Update CA certificates to fix TLS handshake issues on ARM64
45
RUN apt-get update && apt-get install -y ca-certificates && update-ca-certificates && rm -rf /var/lib/apt/lists/*
56

67
WORKDIR $GOPATH/main
78
COPY . .
8-
RUN go env -w GOPROXY=direct
9-
# Retry logic for go mod download to handle transient network issues
10-
RUN for i in 1 2 3; do GO111MODULE=on go mod download && break || sleep 5; done
11-
RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build -o=/bin/main .
9+
10+
RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -o=/bin/main .
1211

1312
FROM scratch
1413
COPY --from=build /bin/main /bin/main

‎mocked_servers/https/certificates/private.key‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
-----BEGIN PRIVATE KEY-----
2-
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
51-
ZuuFPRcEM013x/UU+rKpgZSPRL4Kpg==
2+
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
51+
Uib6hsiBPfZwAiShdxbDfJ6rC7aHh70=
5252
-----END PRIVATE KEY-----

‎mocked_servers/https/certificates/ssl/ca-bundle.crt‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3807,38 +3807,37 @@ MdRAGmI0Nj81Aa6sY6A=
38073807

38083808
# mocked_servers
38093809
-----BEGIN CERTIFICATE-----
3810-
MIIGOTCCBCGgAwIBAgIUOC690+JU8rTscD39jofDLF+wfmEwDQYJKoZIhvcNAQEL
3811-
BQAwgaAxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApXYXNoaW5ndG9uMRAwDgYDVQQH
3812-
DAdTZWF0dGxlMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxFjAUBgNVBAsMDUlU
3813-
IERlcGFydG1lbnQxIjAgBgkqhkiG9w0BCQEWE2V4YW1wbGVAZXhhbXBsZS5jb20x
3814-
FDASBgNVBAMMC2V4YW1wbGUuY29tMB4XDTI0MTExMjE4MDAwNFoXDTI1MTExMjE4
3815-
MDAwNFowgaAxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApXYXNoaW5ndG9uMRAwDgYD
3816-
VQQHDAdTZWF0dGxlMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxFjAUBgNVBAsM
3817-
DUlUIERlcGFydG1lbnQxIjAgBgkqhkiG9w0BCQEWE2V4YW1wbGVAZXhhbXBsZS5j
3818-
b20xFDASBgNVBAMMC2V4YW1wbGUuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
3819-
MIICCgKCAgEA1PSGlhjyZFksCMJGAGdhjmC+1MxbDwwYuJLxmUsIub5l38k62Cec
3820-
fj71aneInPKnCGgHtS1mkaUojFas6mqldbrtf5j+wShrMeDxUPHc9JS7JkQoSSE5
3821-
i+KEd8fWswrhAOJVqv3aeLn61xQ2kkcAgRlTdDc6OP4oy71J+gtuYmVHht+3G4CE
3822-
bwz3CXYAtFDRa0tPf9RyBXABJH2hS9lPLLSYOigCq7uABhxOny2ZdNuGPHtn4IhR
3823-
CPlU0uc+Rw6WTZ+UjkZJfA5+prnjnAahkVxZ2/Aw/GeWvjYaaDbMyaOIdNKS3eA6
3824-
3VFiLAWb3dW7QDykvt9rIl4kyKC2Vr8WLByvZAEEtoa5888n4okkxSJMURD7aXbs
3825-
buOH+KOzNb+j05DGsf6XNVJ/8rvs1gJGnmIb0NPtq2hfVwU3oPDTeKyNuGYc21h0
3826-
V9x5UyhQXpX+ZS4Y3O/W42ACttdH+FY7YLVoyAV2wjgeEtSl1jEHv9p+wORfbVID
3827-
maBuYzDY0uQJnRzVT0M9u4TncaM2hJae14rhXeGggxqMJN51uwaTlhIhfxX1rOce
3828-
SKYu0P/anRmUnFT8m3EEnjMfgFP3uRdr1J5dbUkYzu3WlXnM4ihw7kJ5DiN9Og14
3829-
DmXQmBl724Gw6bGnUYU62PxojRwZrosIt6TDXfnLrjLdqDjB3WLRgqkCAwEAAaNp
3830-
MGcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwLgYDVR0RBCcwJYIJbG9jYWxob3N0
3831-
ggkxMjcuMC4wLjGCDW1vY2tlZC1zZXJ2ZXIwHQYDVR0OBBYEFIuFlzLRkrwa/9H9
3832-
FLfAEs5/40dXMA0GCSqGSIb3DQEBCwUAA4ICAQAFCRAHCxNCE7Us73B2C9gG9zHs
3833-
0gr55K9mRvtGnpGwtYCUm9PTjUyEvHaVFXFcCkyIN9RlgddcgI5s82r+ppr3meKW
3834-
gXiPdBiA3tYxeICRlpvGNLMhojc1txDvk/gba8dHY+JO4VCRzZmIjdY3Mi5UW9Gw
3835-
87NGKH8llnHX6uVItUuQFYL43WRXzwbtMnVqkTTJA8ytsHYzChQoq/7mAqiYoz89
3836-
l5FD0acuCZsrbK2y5+hiYXM3MWci4znsnZVfdM/aeccnlKKzczTzB5XdeEgkL+6Z
3837-
hRIPR9Z8o7ui0/8Etohux45bNBxeDq0/N3ia3z83gumUWc3/rHSLpIZCBf86oQVN
3838-
g1LCwB+fzmGuvvw4iqrTQlx3Nfh648QHVA9L8KNU2ZK6dV4wzn+n51s80sQk0D8O
3839-
ufBTL3nbzn+yZs6E1BnwUO8U85LVJLBxcFW85QGMYtPBSM3rbmRvre7OLROqYgJ1
3840-
gTsMGrUGUBvvah2a60DoVmwH0qOmAVZyaNJCvUXPuKgi1fql/EjwiuAYwibU2UJz
3841-
UqgR95r1+dj6gmtyqDy6Q/blzS7g2/TEy0hkvygKTa3UNOFBAFdmYq3MZIOMu/zx
3842-
XktLlqxG8S+AWG5wsdQCEW/rqLQMu2XDklEOzyk+/PwHHqvD8569KjEVJJbsmLMO
3843-
WrVmhVniZxj+qO+Now==
3810+
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
3842+
ztwm8WOQQcixc0w+r0vArvS49A==
38443843
-----END CERTIFICATE-----

‎mocked_servers/https/certificates/ssl/certificate.crt‎

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,35 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIE4DCCAsigAwIBAgIJAOg0rhtbzLxYMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
3-
BAMMDW1vY2tlZC1zZXJ2ZXIwHhcNMjUxMjEwMjMwOTI5WhcNMjYxMjEwMjMwOTI5
4-
WjAYMRYwFAYDVQQDDA1tb2NrZWQtc2VydmVyMIICIjANBgkqhkiG9w0BAQEFAAOC
5-
Ag8AMIICCgKCAgEAukEeFcCAR9gZFKE7qdez4rGpbOrmcbj+ScztC0MV00UHnkSx
6-
Ej/i0XWiZTCzTVp9o1xZNPtlZUJ0BDBETO6ZlQ3fly/Je/Ux8TL2tuybkB2/npGE
7-
eXiqm+MVE2sQ2R4XgpWRqmhbBnSYYXZgWAAsVTC7YAJLs48sFIiR1dlHZcqBEXC9
8-
XQBsJ48Y5Cw6c8UGLO4ZgrEAGblyC+W6pSd7RyUr3FAMIW+9ixhDVFhuG23n+1DA
9-
C6u7C0HlliCDY01rzTnMjQM2+rUFhPyEKf9swfJf7Xr47yW9blfj5yM7AyEQvnp3
10-
EWS6nCqlg0XA4EyooL87kL0HUZFahQGzJRsO4rbycNQWqe7V1xhoAqPOhpwio3uz
11-
Lflv2jxaj/FK3eWJXjuTwluv28ck3uPAt7F507pJ4Qwbw0wbToAtzj1BlwHxcZDw
12-
KakqrtyBUErbe3zMi7KIYxHw8i/UFcGyVv1dwGLUIbfREsDPKPKEUJRhfxIiDfO5
13-
BUjJAWxZF7PXTupWpXht3AW+oHdkzsS1viq6JS67jCMzDdW+8UBEN0YhhRnvF1XT
14-
Wk7snBWbtY5RTC+i8xsAdlmoG4Q3VBL8tLhq4mOSONXzl7m7HJI6WKkC2qfIYf1/
15-
MD+FX+1LahBsNngcGy9iJivspOkFZbVC3m44BpUNcFX3HJrDMfkF7f7lSJcCAwEA
16-
AaMtMCswKQYDVR0RBCIwIIINbW9ja2VkLXNlcnZlcoIJbG9jYWxob3N0hwR/AAAB
17-
MA0GCSqGSIb3DQEBCwUAA4ICAQCl3fRXS+RtMVtqg2LbgSWxU2nuis78lagAD5Yb
18-
Mrvc0fqimUYLN/tgOeA+9LUQBY154CFZirgqiyceroTuA5+xBG1xTAGajI7P5FhM
19-
kIuXhjZRCGMSARaEb+IM6t6tybUCM/1ny9Xu8SV3rKc0sn/XO20BFCyd3U6kXf2M
20-
TCp0I6mUZKfrnrKcK2MAXpznWkyyABtv5ExvrHz8RLEUNCoy72ROs0K14OI6aKuV
21-
i8QCJ9C+Q6lMMtCU3NCkv+UZGXQwR+g7IntE3BnnyRUwY7dwNtxHLsB4zIl5gfrC
22-
W8uexG0Xp2tp7Y/4oOoPhqi4sab+R9N5+8i2Qa30L2IAgPf7URa9VH/yyYXeWBjo
23-
jZjjxLnRZCFwCojxECM71c9Pl0tOZ/ag6LfumNDhrZjSAuq9+WLn4fzN73Gc8ITW
24-
eC0VmKV0og7FtiYioF8cJ5HaelKaE5kkpTzoIVQPtUdr+bU4gZF+585tUxHpHn8P
25-
ZGSwVFBpFIrbn7pponbZW7gzQ19dn6uukKW4kuoP6TUGGSM1ekGVczSf5ruf+82i
26-
JtaqbM/KLG05LcdwdGLJemMikvMsKY+S9xrUtuhLyepqLOkU6BrJHZ6gDBjvts99
27-
hvib1VXFxA7fz7LwLfajreEWZxRn15xPKoZk7GomlaR7NpO2B2HDL8M5nOE2oZdT
28-
ILSYZg==
2+
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
34+
ztwm8WOQQcixc0w+r0vArvS49A==
2935
-----END CERTIFICATE-----

‎sample-apps/jaeger-zipkin-sample-app/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM gradle:8.1.1-jdk17 as builder
1+
FROM --platform=$BUILDPLATFORM gradle:8.1.1-jdk17 AS builder
22

33
WORKDIR /app
44
COPY ./build.gradle ./build.gradle

‎sample-apps/jmx/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the war file
2-
FROM maven:3-openjdk-8 as build
2+
FROM --platform=$BUILDPLATFORM maven:3.9-eclipse-temurin-8 AS build
33

44
WORKDIR /app
55
COPY . .

‎sample-apps/prometheus/Dockerfile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
FROM golang:1.23 as build
1+
FROM --platform=$BUILDPLATFORM golang:1.23 AS build
2+
ARG TARGETARCH
23
WORKDIR $GOPATH/main
34
COPY . .
4-
RUN go env -w GOPROXY=direct
5-
# Retry logic for go mod download to handle transient network issues
6-
RUN for i in 1 2 3; do GO111MODULE=on go mod download && break || sleep 5; done
7-
RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build -o=/bin/main .
5+
6+
RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -o=/bin/main .
87

98
FROM scratch
109
COPY --from=build /bin/main /bin/main

0 commit comments

Comments
 (0)