Skip to content

Commit 2de1ef1

Browse files
lukekraus45lukekraus45
authored
Merge pull request #53 from DataDog/luke/fix-deployment-staging
updating deployment to fix failures from merging upstream
2 parents 69eba1f + 85ef8d4 commit 2de1ef1

File tree

13 files changed

+93
-219
lines changed

13 files changed

+93
-219
lines changed

‎.gitlab-ci.yml

-6
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@ build-ci-image-emailservice:
6262
DOCKERFILE: src/emailservice/Dockerfile
6363
IMAGE_TAG_SUFFIX: emailservice
6464
CONTEXT: src/emailservice
65-
build-ci-image-featureflagservice:
66-
!!merge <<: *build-ci-image
67-
variables:
68-
DOCKERFILE: src/featureflagservice/Dockerfile
69-
IMAGE_TAG_SUFFIX: featureflagservice
70-
CONTEXT: .
7165
build-ci-image-frauddetectionservice:
7266
!!merge <<: *build-ci-image
7367
variables:

‎ci/values.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,6 @@ components:
160160
resources:
161161
limits:
162162
memory: 200Mi
163-
featureflagService:
164-
resources:
165-
limits:
166-
memory: 1Gi
167163
kafka:
168164
resources:
169165
limits:

‎kubernetes/opentelemetry-demo.yaml

-26
Original file line numberDiff line numberDiff line change
@@ -8607,32 +8607,6 @@ spec:
86078607
# Source: opentelemetry-demo/templates/component.yaml
86088608
apiVersion: v1
86098609
kind: Service
8610-
metadata:
8611-
name: opentelemetry-demo-featureflagservice
8612-
labels:
8613-
8614-
opentelemetry.io/name: opentelemetry-demo-featureflagservice
8615-
app.kubernetes.io/instance: opentelemetry-demo
8616-
app.kubernetes.io/component: featureflagservice
8617-
app.kubernetes.io/name: opentelemetry-demo-featureflagservice
8618-
app.kubernetes.io/version: "1.8.0"
8619-
app.kubernetes.io/part-of: opentelemetry-demo
8620-
spec:
8621-
type: ClusterIP
8622-
ports:
8623-
- port: 50053
8624-
name: grpc
8625-
targetPort: 50053
8626-
- port: 8081
8627-
name: http
8628-
targetPort: 8081
8629-
selector:
8630-
8631-
opentelemetry.io/name: opentelemetry-demo-featureflagservice
8632-
---
8633-
# Source: opentelemetry-demo/templates/component.yaml
8634-
apiVersion: v1
8635-
kind: Service
86368610
metadata:
86378611
name: opentelemetry-demo-ffspostgres
86388612
labels:

‎src/accountingservice/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44

5-
FROM registry.ddbuild.io/images/mirror/golang:1.21.4-alpine AS builder
5+
FROM registry.ddbuild.io/images/mirror/golang:1.22-alpine AS builder
66
WORKDIR /usr/src/app/
77

88
COPY ./src/accountingservice/ ./

‎src/accountingservice/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ require (
4545
golang.org/x/text v0.14.0 // indirect
4646
google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe // indirect
4747
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect
48-
)
48+
)

‎src/accountingservice/go.sum

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,4 +146,4 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
146146
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
147147
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
148148
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
149-
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
149+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎src/adservice/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ARG version=2.0.0
2424
WORKDIR /usr/src/app/
2525

2626
COPY --from=builder /usr/src/app/ ./
27-
ADD --chmod=644 https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/opentelemetry-javaagent.jar /usr/src/app/opentelemetry-javaagent.jar
27+
ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/opentelemetry-javaagent.jar /usr/src/app/opentelemetry-javaagent.jar
2828
ENV JAVA_TOOL_OPTIONS=-javaagent:/usr/src/app/opentelemetry-javaagent.jar
2929

3030
EXPOSE ${AD_SERVICE_PORT}

‎src/checkoutservice/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44

5-
FROM registry.ddbuild.io/images/mirror/golang:1.21.4-alpine AS builder
5+
FROM registry.ddbuild.io/images/mirror/golang:1.22-alpine AS builder
66
WORKDIR /usr/src/app/
77

88
COPY ./src/checkoutservice/ ./

‎src/featureflagservice/Dockerfile

-111
This file was deleted.

‎src/productcatalogservice/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44

5-
FROM registry.ddbuild.io/images/mirror/golang:1.21.4-alpine AS builder
5+
FROM registry.ddbuild.io/images/mirror/golang:1.22-alpine AS builder
66

77
WORKDIR /usr/src/app/
88

‎src/productcatalogservice/go.mod

+40-11
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,47 @@ require (
3131
github.com/fsnotify/fsnotify v1.7.0 // indirect
3232
github.com/go-logr/logr v1.4.1 // indirect
3333
github.com/go-logr/stdr v1.2.2 // indirect
34-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
35-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
36-
go.opentelemetry.io/otel/metric v1.20.0 // indirect
37-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
38-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
39-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
34+
github.com/go-logr/zapr v1.2.4 // indirect
35+
github.com/gogo/protobuf v1.3.2 // indirect
36+
github.com/golang/protobuf v1.5.3 // indirect
37+
github.com/google/gofuzz v1.2.0 // indirect
38+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
39+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
40+
github.com/json-iterator/go v1.1.12 // indirect
41+
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
42+
github.com/mitchellh/copystructure v1.2.0 // indirect
43+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
44+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
45+
github.com/modern-go/reflect2 v1.0.2 // indirect
46+
github.com/open-feature/flagd/core v0.7.4 // indirect
47+
github.com/open-feature/schemas v0.2.8 // indirect
48+
github.com/twmb/murmur3 v1.1.8 // indirect
49+
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
50+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
51+
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
52+
github.com/zeebo/xxh3 v1.0.2 // indirect
53+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
54+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
55+
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
56+
go.uber.org/multierr v1.11.0 // indirect
57+
go.uber.org/zap v1.26.0 // indirect
58+
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect
59+
golang.org/x/mod v0.14.0 // indirect
60+
golang.org/x/net v0.21.0 // indirect
61+
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
62+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
63+
gopkg.in/inf.v0 v0.9.1 // indirect
64+
gopkg.in/yaml.v2 v2.4.0 // indirect
65+
gopkg.in/yaml.v3 v3.0.1 // indirect
66+
k8s.io/apimachinery v0.29.0 // indirect
67+
k8s.io/klog/v2 v2.110.1 // indirect
68+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
69+
sigs.k8s.io/controller-runtime v0.16.3 // indirect
70+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
71+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
4072
)
4173

4274
require (
43-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0
44-
go.opentelemetry.io/otel v1.20.0
45-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0
46-
golang.org/x/sys v0.14.0 // indirect
47-
golang.org/x/text v0.13.0 // indirect
75+
golang.org/x/sys v0.17.0 // indirect
76+
golang.org/x/text v0.14.0 // indirect
4877
)

0 commit comments

Comments
 (0)