diff --git a/incubator/opentelemetry-operator/Chart.yaml b/incubator/opentelemetry-operator/Chart.yaml index a23decf..442583f 100644 --- a/incubator/opentelemetry-operator/Chart.yaml +++ b/incubator/opentelemetry-operator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: tencent-opentelemetry-operator -version: 0.89.0 +version: 0.90.0 description: OpenTelemetry Operator Helm chart for Kubernetes type: application home: https://opentelemetry.io/ @@ -9,5 +9,5 @@ sources: maintainers: - name: erichchen icon: https://cloudcache.tencent-cloud.com/qcloud/ui/static/Industry_tke/80444e53-c142-4896-bc8a-ef4ecf75c682.png -appVersion: 0.89.0 +appVersion: 0.90.0 kubeVersion: '>= 1.19.0-0' diff --git a/incubator/opentelemetry-operator/templates/_helpers.tpl b/incubator/opentelemetry-operator/templates/_helpers.tpl index 22a00e9..3cc82b9 100644 --- a/incubator/opentelemetry-operator/templates/_helpers.tpl +++ b/incubator/opentelemetry-operator/templates/_helpers.tpl @@ -107,6 +107,12 @@ Create an ordered name of the MutatingWebhookConfiguration "ap-tokyo" "jpccr.ccs.tencentyun.com" "ap-mumbai" "inccr.ccs.tencentyun.com" "ap-shenzhen-fsi" "szjrccr.ccs.tencentyun.com" + "ap-guangzhou-wxzf" "gzwxzfccr.ccs.tencentyun.com" + "ap-shenzhen-jxcft" "szjxcftccr.ccs.tencentyun.com" + "ap-shanghai-hq-cft" "shhqcftccr.ccs.tencentyun.com" + "ap-shanghai-hq-uat-cft" "shhqcftfzhjccr.ccs.tencentyun.com" + "ap-shanghai-wxzf" "shwxzfccr.ccs.tencentyun.com" + "ap-shanghai-adc" "shadcccr.ccs.tencentyun.com" "ap-taipei" "tpeccr.ccs.tencentyun.com" -}} {{- $result := index $map $region | default "ccr.ccs.tencentyun.com" -}} {{- $result -}} diff --git a/incubator/opentelemetry-operator/templates/deployment.yaml b/incubator/opentelemetry-operator/templates/deployment.yaml index 4fbb3c2..ac6c312 100644 --- a/incubator/opentelemetry-operator/templates/deployment.yaml +++ b/incubator/opentelemetry-operator/templates/deployment.yaml @@ -78,6 +78,10 @@ spec: - name: {{ $name }} value: {{ $value | quote -}} {{- end }} + {{- if (eq .Values.env.FROM_INTERNET "true") }} + - name: API_ENDPOINT + value: "apm.tencentcloudapi.com" + {{- end }} - name: TKE_CLUSTER_ID value: {{ .Values.env.TKE_CLUSTER_ID | quote }} - name: TKE_REGION diff --git a/incubator/opentelemetry-operator/values.yaml b/incubator/opentelemetry-operator/values.yaml index 2a5ffb3..59ca3ef 100644 --- a/incubator/opentelemetry-operator/values.yaml +++ b/incubator/opentelemetry-operator/values.yaml @@ -29,7 +29,7 @@ pdb: manager: image: repository: ccr.ccs.tencentyun.com/tke-market/opentelemetry-operator - tag: 20240904-2027_apm_0.89.0_auto_fc53219c + tag: 20241209-1039_apm_0.90.0_auto_66c0d092 collectorImage: repository: ccr.ccs.tencentyun.com/tke-market/opentelemetry-collector-contrib tag: 0.85.0 @@ -267,7 +267,7 @@ testFramework: tag: latest env: - ## Required, obtained from the tke console + ## Required, obtained from the tke console. For non-TKE users, enter "N/A" TKE_CLUSTER_ID: "" TKE_REGION: "" ## Required, obtained from the apm console @@ -284,6 +284,9 @@ env: ## Optional, default "false"; Set to "true" for international users INTL_SITE: "false" + ## Optional, default "false"; Set to "true" for integrating with APM service via internet endpoint + FROM_INTERNET: "false" + config: "java": "bwiefeunq4+28k5omTkgc3XQLHjDEh4aylntxj4NiVRsibnL5n4Kk0EHTYJPoXHe" "python": "4jIDAZIsW4/kuFgKHgcZwjQo31drB4bfliBsaNdflQuak7EXJvmx+aoQ4s3bQjxd"