Skip to content

Commit c2d9516

Browse files
dxFrankenWangdaixuwang
andauthored
feat: add all tke image depository address (#115)
feat: operator for internet user it is based on operator 0.89.0 Co-authored-by: daixuwang <daixuwang@tencent.com>
1 parent 75117e5 commit c2d9516

File tree

4 files changed

+17
-4
lines changed

4 files changed

+17
-4
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: tencent-opentelemetry-operator
3-
version: 0.89.0
3+
version: 0.90.0
44
description: OpenTelemetry Operator Helm chart for Kubernetes
55
type: application
66
home: https://opentelemetry.io/
@@ -9,5 +9,5 @@ sources:
99
maintainers:
1010
- name: erichchen
1111
icon: https://cloudcache.tencent-cloud.com/qcloud/ui/static/Industry_tke/80444e53-c142-4896-bc8a-ef4ecf75c682.png
12-
appVersion: 0.89.0
12+
appVersion: 0.90.0
1313
kubeVersion: '>= 1.19.0-0'

incubator/opentelemetry-operator/templates/_helpers.tpl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,12 @@ Create an ordered name of the MutatingWebhookConfiguration
107107
"ap-tokyo" "jpccr.ccs.tencentyun.com"
108108
"ap-mumbai" "inccr.ccs.tencentyun.com"
109109
"ap-shenzhen-fsi" "szjrccr.ccs.tencentyun.com"
110+
"ap-guangzhou-wxzf" "gzwxzfccr.ccs.tencentyun.com"
111+
"ap-shenzhen-jxcft" "szjxcftccr.ccs.tencentyun.com"
112+
"ap-shanghai-hq-cft" "shhqcftccr.ccs.tencentyun.com"
113+
"ap-shanghai-hq-uat-cft" "shhqcftfzhjccr.ccs.tencentyun.com"
114+
"ap-shanghai-wxzf" "shwxzfccr.ccs.tencentyun.com"
115+
"ap-shanghai-adc" "shadcccr.ccs.tencentyun.com"
110116
"ap-taipei" "tpeccr.ccs.tencentyun.com" -}}
111117
{{- $result := index $map $region | default "ccr.ccs.tencentyun.com" -}}
112118
{{- $result -}}

incubator/opentelemetry-operator/templates/deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ spec:
7878
- name: {{ $name }}
7979
value: {{ $value | quote -}}
8080
{{- end }}
81+
{{- if (eq .Values.env.FROM_INTERNET "true") }}
82+
- name: API_ENDPOINT
83+
value: "apm.tencentcloudapi.com"
84+
{{- end }}
8185
- name: TKE_CLUSTER_ID
8286
value: {{ .Values.env.TKE_CLUSTER_ID | quote }}
8387
- name: TKE_REGION

incubator/opentelemetry-operator/values.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pdb:
2929
manager:
3030
image:
3131
repository: ccr.ccs.tencentyun.com/tke-market/opentelemetry-operator
32-
tag: 20240904-2027_apm_0.89.0_auto_fc53219c
32+
tag: 20241209-1039_apm_0.90.0_auto_66c0d092
3333
collectorImage:
3434
repository: ccr.ccs.tencentyun.com/tke-market/opentelemetry-collector-contrib
3535
tag: 0.85.0
@@ -267,7 +267,7 @@ testFramework:
267267
tag: latest
268268

269269
env:
270-
## Required, obtained from the tke console
270+
## Required, obtained from the tke console. For non-TKE users, enter "N/A"
271271
TKE_CLUSTER_ID: ""
272272
TKE_REGION: ""
273273
## Required, obtained from the apm console
@@ -284,6 +284,9 @@ env:
284284
## Optional, default "false"; Set to "true" for international users
285285
INTL_SITE: "false"
286286

287+
## Optional, default "false"; Set to "true" for integrating with APM service via internet endpoint
288+
FROM_INTERNET: "false"
289+
287290
config:
288291
"java": "bwiefeunq4+28k5omTkgc3XQLHjDEh4aylntxj4NiVRsibnL5n4Kk0EHTYJPoXHe"
289292
"python": "4jIDAZIsW4/kuFgKHgcZwjQo31drB4bfliBsaNdflQuak7EXJvmx+aoQ4s3bQjxd"

0 commit comments

Comments
 (0)