[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
PGDream commented on a change in pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r835118707
##
File path: charts/apisix/templates/daemonset.yaml
##
@@ -0,0 +1,201 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+{{- if eq .Values.apisix.kind "DaemonSet" }}
+{{- if .Values.apisix.enabled }}
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+ name: {{ include "apisix.fullname" . }}
+ namespace: {{ .Release.Namespace }}
+ labels:
+{{- include "apisix.labels" . | nindent 4 }}
+spec:
+ selector:
+matchLabels:
+ {{- include "apisix.selectorLabels" . | nindent 6 }}
+ template:
+metadata:
+ annotations:
+checksum/config: {{ include (print $.Template.BasePath
"/configmap.yaml") . | sha256sum }}
+{{- with .Values.apisix.podAnnotations }}
+{{- toYaml . | nindent 8 }}
+{{- end }}
+ labels:
+{{- include "apisix.selectorLabels" . | nindent 8 }}
+spec:
+ {{- with .Values.global.imagePullSecrets }}
+ imagePullSecrets:
+{{- toYaml . | nindent 8 }}
+ {{- end }}
+ securityContext:
+{{- toYaml .Values.podSecurityContext | nindent 8 }}
+ containers:
+- name: {{ .Chart.Name }}
+ securityContext:
+{{- toYaml .Values.securityContext | nindent 12 }}
+ image: "{{ .Values.apisix.image.repository }}:{{
.Values.apisix.image.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.apisix.image.pullPolicy }}
+ ports:
+- name: http
+ containerPort: {{ .Values.gateway.http.containerPort }}
+ protocol: TCP
+- name: tls
+ containerPort: {{ .Values.gateway.tls.containerPort }}
+ protocol: TCP
+{{- if .Values.admin.enabled }}
+- name: admin
+ containerPort: {{ .Values.admin.port }}
+ protocol: TCP
+{{- end }}
+{{- if .Values.serviceMonitor.enabled }}
+- name: prometheus
+ containerPort: {{ .Values.serviceMonitor.containerPort }}
+ protocol: TCP
+{{- end }}
+{{- if and .Values.gateway.stream.enabled (or (gt (len
.Values.gateway.stream.tcp) 0) (gt (len .Values.gateway.stream.udp) 0)) }}
+{{- with .Values.gateway.stream }}
+{{- if (gt (len .tcp) 0) }}
+{{- range $index, $port := .tcp }}
+- name: proxy-tcp-{{ $index | toString }}
+ containerPort: {{ $port }}
+ protocol: TCP
+{{- end }}
+{{- end }}
+{{- if (gt (len .udp) 0) }}
+{{- range $index, $port := .udp }}
+- name: proxy-udp-{{ $index | toString }}
+ containerPort: {{ $port }}
+ protocol: UDP
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+ readinessProbe:
+failureThreshold: 6
+initialDelaySeconds: 10
+periodSeconds: 10
+successThreshold: 1
+tcpSocket:
+ port: {{ .Values.gateway.http.containerPort }}
+timeoutSeconds: 1
+ lifecycle:
+preStop:
+ exec:
+command:
+- /bin/sh
+- -c
+- "sleep 30"
+ env:
+- name: INTRANET_IP
Review comment:
@tokers please review
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
PGDream commented on a change in pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r835115394
##
File path: charts/apisix/templates/daemonset.yaml
##
@@ -0,0 +1,201 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+{{- if eq .Values.apisix.kind "DaemonSet" }}
+{{- if .Values.apisix.enabled }}
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+ name: {{ include "apisix.fullname" . }}
+ namespace: {{ .Release.Namespace }}
+ labels:
+{{- include "apisix.labels" . | nindent 4 }}
+spec:
+ selector:
+matchLabels:
+ {{- include "apisix.selectorLabels" . | nindent 6 }}
+ template:
+metadata:
+ annotations:
+checksum/config: {{ include (print $.Template.BasePath
"/configmap.yaml") . | sha256sum }}
+{{- with .Values.apisix.podAnnotations }}
+{{- toYaml . | nindent 8 }}
+{{- end }}
+ labels:
+{{- include "apisix.selectorLabels" . | nindent 8 }}
+spec:
+ {{- with .Values.global.imagePullSecrets }}
+ imagePullSecrets:
+{{- toYaml . | nindent 8 }}
+ {{- end }}
+ securityContext:
+{{- toYaml .Values.podSecurityContext | nindent 8 }}
+ containers:
+- name: {{ .Chart.Name }}
+ securityContext:
+{{- toYaml .Values.securityContext | nindent 12 }}
+ image: "{{ .Values.apisix.image.repository }}:{{
.Values.apisix.image.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.apisix.image.pullPolicy }}
+ ports:
+- name: http
+ containerPort: {{ .Values.gateway.http.containerPort }}
+ protocol: TCP
+- name: tls
+ containerPort: {{ .Values.gateway.tls.containerPort }}
+ protocol: TCP
+{{- if .Values.admin.enabled }}
+- name: admin
+ containerPort: {{ .Values.admin.port }}
+ protocol: TCP
+{{- end }}
+{{- if .Values.serviceMonitor.enabled }}
+- name: prometheus
+ containerPort: {{ .Values.serviceMonitor.containerPort }}
+ protocol: TCP
+{{- end }}
+{{- if and .Values.gateway.stream.enabled (or (gt (len
.Values.gateway.stream.tcp) 0) (gt (len .Values.gateway.stream.udp) 0)) }}
+{{- with .Values.gateway.stream }}
+{{- if (gt (len .tcp) 0) }}
+{{- range $index, $port := .tcp }}
+- name: proxy-tcp-{{ $index | toString }}
+ containerPort: {{ $port }}
+ protocol: TCP
+{{- end }}
+{{- end }}
+{{- if (gt (len .udp) 0) }}
+{{- range $index, $port := .udp }}
+- name: proxy-udp-{{ $index | toString }}
+ containerPort: {{ $port }}
+ protocol: UDP
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+ readinessProbe:
+failureThreshold: 6
+initialDelaySeconds: 10
+periodSeconds: 10
+successThreshold: 1
+tcpSocket:
+ port: {{ .Values.gateway.http.containerPort }}
+timeoutSeconds: 1
+ lifecycle:
+preStop:
+ exec:
+command:
+- /bin/sh
+- -c
+- "sleep 30"
+ env:
+- name: INTRANET_IP
Review comment:
OK
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
PGDream commented on a change in pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r834919329
##
File path: charts/apisix/templates/daemonset.yaml
##
@@ -0,0 +1,201 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+{{- if eq .Values.apisix.kind "DaemonSet" }}
+{{- if .Values.apisix.enabled }}
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+ name: {{ include "apisix.fullname" . }}
+ namespace: {{ .Release.Namespace }}
+ labels:
+{{- include "apisix.labels" . | nindent 4 }}
+spec:
+ selector:
+matchLabels:
+ {{- include "apisix.selectorLabels" . | nindent 6 }}
+ template:
+metadata:
+ annotations:
+checksum/config: {{ include (print $.Template.BasePath
"/configmap.yaml") . | sha256sum }}
+{{- with .Values.apisix.podAnnotations }}
+{{- toYaml . | nindent 8 }}
+{{- end }}
+ labels:
+{{- include "apisix.selectorLabels" . | nindent 8 }}
+spec:
+ {{- with .Values.global.imagePullSecrets }}
+ imagePullSecrets:
+{{- toYaml . | nindent 8 }}
+ {{- end }}
+ securityContext:
+{{- toYaml .Values.podSecurityContext | nindent 8 }}
+ containers:
+- name: {{ .Chart.Name }}
+ securityContext:
+{{- toYaml .Values.securityContext | nindent 12 }}
+ image: "{{ .Values.apisix.image.repository }}:{{
.Values.apisix.image.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.apisix.image.pullPolicy }}
+ ports:
+- name: http
+ containerPort: {{ .Values.gateway.http.containerPort }}
+ protocol: TCP
+- name: tls
+ containerPort: {{ .Values.gateway.tls.containerPort }}
+ protocol: TCP
+{{- if .Values.admin.enabled }}
+- name: admin
+ containerPort: {{ .Values.admin.port }}
+ protocol: TCP
+{{- end }}
+{{- if .Values.serviceMonitor.enabled }}
+- name: prometheus
+ containerPort: {{ .Values.serviceMonitor.containerPort }}
+ protocol: TCP
+{{- end }}
+{{- if and .Values.gateway.stream.enabled (or (gt (len
.Values.gateway.stream.tcp) 0) (gt (len .Values.gateway.stream.udp) 0)) }}
+{{- with .Values.gateway.stream }}
+{{- if (gt (len .tcp) 0) }}
+{{- range $index, $port := .tcp }}
+- name: proxy-tcp-{{ $index | toString }}
+ containerPort: {{ $port }}
+ protocol: TCP
+{{- end }}
+{{- end }}
+{{- if (gt (len .udp) 0) }}
+{{- range $index, $port := .udp }}
+- name: proxy-udp-{{ $index | toString }}
+ containerPort: {{ $port }}
+ protocol: UDP
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+ readinessProbe:
+failureThreshold: 6
+initialDelaySeconds: 10
+periodSeconds: 10
+successThreshold: 1
+tcpSocket:
+ port: {{ .Values.gateway.http.containerPort }}
+timeoutSeconds: 1
+ lifecycle:
+preStop:
+ exec:
+command:
+- /bin/sh
+- -c
+- "sleep 30"
+ env:
+- name: INTRANET_IP
Review comment:
sorry, `INTRANET_IP` env with `Prometheus`
apisix config.yaml:
```
prometheus:
export_addr:
ip: "${{INTRANET_IP}}"
port: 9092
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
PGDream commented on a change in pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r834302360
##
File path: charts/apisix/templates/daemonset.yaml
##
@@ -0,0 +1,201 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+{{- if eq .Values.apisix.kind "DaemonSet" }}
+{{- if .Values.apisix.enabled }}
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+ name: {{ include "apisix.fullname" . }}
+ namespace: {{ .Release.Namespace }}
+ labels:
+{{- include "apisix.labels" . | nindent 4 }}
+spec:
+ selector:
+matchLabels:
+ {{- include "apisix.selectorLabels" . | nindent 6 }}
+ template:
+metadata:
+ annotations:
+checksum/config: {{ include (print $.Template.BasePath
"/configmap.yaml") . | sha256sum }}
+{{- with .Values.apisix.podAnnotations }}
+{{- toYaml . | nindent 8 }}
+{{- end }}
+ labels:
+{{- include "apisix.selectorLabels" . | nindent 8 }}
+spec:
+ {{- with .Values.global.imagePullSecrets }}
+ imagePullSecrets:
+{{- toYaml . | nindent 8 }}
+ {{- end }}
+ securityContext:
+{{- toYaml .Values.podSecurityContext | nindent 8 }}
+ containers:
+- name: {{ .Chart.Name }}
+ securityContext:
+{{- toYaml .Values.securityContext | nindent 12 }}
+ image: "{{ .Values.apisix.image.repository }}:{{
.Values.apisix.image.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.apisix.image.pullPolicy }}
+ ports:
+- name: http
+ containerPort: {{ .Values.gateway.http.containerPort }}
+ protocol: TCP
+- name: tls
+ containerPort: {{ .Values.gateway.tls.containerPort }}
+ protocol: TCP
+{{- if .Values.admin.enabled }}
+- name: admin
+ containerPort: {{ .Values.admin.port }}
+ protocol: TCP
+{{- end }}
+{{- if .Values.serviceMonitor.enabled }}
+- name: prometheus
+ containerPort: {{ .Values.serviceMonitor.containerPort }}
+ protocol: TCP
+{{- end }}
+{{- if and .Values.gateway.stream.enabled (or (gt (len
.Values.gateway.stream.tcp) 0) (gt (len .Values.gateway.stream.udp) 0)) }}
+{{- with .Values.gateway.stream }}
+{{- if (gt (len .tcp) 0) }}
+{{- range $index, $port := .tcp }}
+- name: proxy-tcp-{{ $index | toString }}
+ containerPort: {{ $port }}
+ protocol: TCP
+{{- end }}
+{{- end }}
+{{- if (gt (len .udp) 0) }}
+{{- range $index, $port := .udp }}
+- name: proxy-udp-{{ $index | toString }}
+ containerPort: {{ $port }}
+ protocol: UDP
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+ readinessProbe:
+failureThreshold: 6
+initialDelaySeconds: 10
+periodSeconds: 10
+successThreshold: 1
+tcpSocket:
+ port: {{ .Values.gateway.http.containerPort }}
+timeoutSeconds: 1
+ lifecycle:
+preStop:
+ exec:
+command:
+- /bin/sh
+- -c
+- "sleep 30"
+ env:
+- name: INTRANET_IP
Review comment:
apisix dashboard controller panel can skywalking plugin config
`INTRANET_IP` env var
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
PGDream commented on a change in pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r834118488
##
File path: charts/apisix/templates/daemonset.yaml
##
@@ -0,0 +1,201 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+{{- if eq .Values.apisix.kind "DaemonSet" }}
+{{- if .Values.apisix.enabled }}
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+ name: {{ include "apisix.fullname" . }}
+ namespace: {{ .Release.Namespace }}
+ labels:
+{{- include "apisix.labels" . | nindent 4 }}
+spec:
+ selector:
+matchLabels:
+ {{- include "apisix.selectorLabels" . | nindent 6 }}
+ template:
+metadata:
+ annotations:
+checksum/config: {{ include (print $.Template.BasePath
"/configmap.yaml") . | sha256sum }}
+{{- with .Values.apisix.podAnnotations }}
+{{- toYaml . | nindent 8 }}
+{{- end }}
+ labels:
+{{- include "apisix.selectorLabels" . | nindent 8 }}
+spec:
+ {{- with .Values.global.imagePullSecrets }}
+ imagePullSecrets:
+{{- toYaml . | nindent 8 }}
+ {{- end }}
+ securityContext:
+{{- toYaml .Values.podSecurityContext | nindent 8 }}
+ containers:
+- name: {{ .Chart.Name }}
+ securityContext:
+{{- toYaml .Values.securityContext | nindent 12 }}
+ image: "{{ .Values.apisix.image.repository }}:{{
.Values.apisix.image.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.apisix.image.pullPolicy }}
+ ports:
+- name: http
+ containerPort: {{ .Values.gateway.http.containerPort }}
+ protocol: TCP
+- name: tls
+ containerPort: {{ .Values.gateway.tls.containerPort }}
+ protocol: TCP
+{{- if .Values.admin.enabled }}
+- name: admin
+ containerPort: {{ .Values.admin.port }}
+ protocol: TCP
+{{- end }}
+{{- if .Values.serviceMonitor.enabled }}
+- name: prometheus
+ containerPort: {{ .Values.serviceMonitor.containerPort }}
+ protocol: TCP
+{{- end }}
+{{- if and .Values.gateway.stream.enabled (or (gt (len
.Values.gateway.stream.tcp) 0) (gt (len .Values.gateway.stream.udp) 0)) }}
+{{- with .Values.gateway.stream }}
+{{- if (gt (len .tcp) 0) }}
+{{- range $index, $port := .tcp }}
+- name: proxy-tcp-{{ $index | toString }}
+ containerPort: {{ $port }}
+ protocol: TCP
+{{- end }}
+{{- end }}
+{{- if (gt (len .udp) 0) }}
+{{- range $index, $port := .udp }}
+- name: proxy-udp-{{ $index | toString }}
+ containerPort: {{ $port }}
+ protocol: UDP
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+ readinessProbe:
+failureThreshold: 6
+initialDelaySeconds: 10
+periodSeconds: 10
+successThreshold: 1
+tcpSocket:
+ port: {{ .Values.gateway.http.containerPort }}
+timeoutSeconds: 1
+ lifecycle:
+preStop:
+ exec:
+command:
+- /bin/sh
+- -c
+- "sleep 30"
+ env:
+- name: INTRANET_IP
Review comment:
skywalking user,check doamin flow
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
PGDream commented on a change in pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r833854282
##
File path: charts/apisix/templates/daemonset.yaml
##
@@ -0,0 +1,201 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+{{- if eq .Values.apisix.kind "DaemonSet" }}
+{{- if .Values.apisix.enabled }}
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+ name: {{ include "apisix.fullname" . }}
+ namespace: {{ .Release.Namespace }}
+ labels:
+{{- include "apisix.labels" . | nindent 4 }}
+spec:
+ selector:
+matchLabels:
+ {{- include "apisix.selectorLabels" . | nindent 6 }}
+ template:
+metadata:
+ annotations:
+checksum/config: {{ include (print $.Template.BasePath
"/configmap.yaml") . | sha256sum }}
+{{- with .Values.apisix.podAnnotations }}
+{{- toYaml . | nindent 8 }}
+{{- end }}
+ labels:
+{{- include "apisix.selectorLabels" . | nindent 8 }}
+spec:
+ {{- with .Values.global.imagePullSecrets }}
+ imagePullSecrets:
+{{- toYaml . | nindent 8 }}
+ {{- end }}
+ securityContext:
+{{- toYaml .Values.podSecurityContext | nindent 8 }}
+ containers:
+- name: {{ .Chart.Name }}
+ securityContext:
+{{- toYaml .Values.securityContext | nindent 12 }}
+ image: "{{ .Values.apisix.image.repository }}:{{
.Values.apisix.image.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.apisix.image.pullPolicy }}
+ ports:
+- name: http
+ containerPort: {{ .Values.gateway.http.containerPort }}
+ protocol: TCP
+- name: tls
+ containerPort: {{ .Values.gateway.tls.containerPort }}
+ protocol: TCP
+{{- if .Values.admin.enabled }}
+- name: admin
+ containerPort: {{ .Values.admin.port }}
+ protocol: TCP
+{{- end }}
+{{- if .Values.serviceMonitor.enabled }}
+- name: prometheus
+ containerPort: {{ .Values.serviceMonitor.containerPort }}
+ protocol: TCP
+{{- end }}
+{{- if and .Values.gateway.stream.enabled (or (gt (len
.Values.gateway.stream.tcp) 0) (gt (len .Values.gateway.stream.udp) 0)) }}
+{{- with .Values.gateway.stream }}
+{{- if (gt (len .tcp) 0) }}
+{{- range $index, $port := .tcp }}
+- name: proxy-tcp-{{ $index | toString }}
+ containerPort: {{ $port }}
+ protocol: TCP
+{{- end }}
+{{- end }}
+{{- if (gt (len .udp) 0) }}
+{{- range $index, $port := .udp }}
+- name: proxy-udp-{{ $index | toString }}
+ containerPort: {{ $port }}
+ protocol: UDP
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+ readinessProbe:
+failureThreshold: 6
+initialDelaySeconds: 10
+periodSeconds: 10
+successThreshold: 1
+tcpSocket:
+ port: {{ .Values.gateway.http.containerPort }}
+timeoutSeconds: 1
+ lifecycle:
+preStop:
+ exec:
+command:
+- /bin/sh
+- -c
+- "sleep 30"
+ env:
+- name: INTRANET_IP
Review comment:
After enabling skywalking, if you use an APISIX cluster, you need to
distinguish which instance the link information comes from
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
PGDream commented on a change in pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r833068007
##
File path: charts/apisix/templates/deployment.yaml
##
@@ -209,3 +209,4 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
+{{- end }}
Review comment:
thx y
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
PGDream commented on a change in pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r833067431
##
File path: charts/apisix/templates/daemonset.yaml
##
@@ -0,0 +1,201 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+{{- if eq .Values.apisix.kind "DaemonSet" }}
+{{- if .Values.apisix.enabled }}
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+ name: {{ include "apisix.fullname" . }}
+ namespace: {{ .Release.Namespace }}
+ labels:
+{{- include "apisix.labels" . | nindent 4 }}
+spec:
+ selector:
+matchLabels:
+ {{- include "apisix.selectorLabels" . | nindent 6 }}
+ template:
+metadata:
+ annotations:
+checksum/config: {{ include (print $.Template.BasePath
"/configmap.yaml") . | sha256sum }}
+{{- with .Values.apisix.podAnnotations }}
+{{- toYaml . | nindent 8 }}
+{{- end }}
+ labels:
+{{- include "apisix.selectorLabels" . | nindent 8 }}
+spec:
+ {{- with .Values.global.imagePullSecrets }}
+ imagePullSecrets:
+{{- toYaml . | nindent 8 }}
+ {{- end }}
+ securityContext:
+{{- toYaml .Values.podSecurityContext | nindent 8 }}
+ containers:
+- name: {{ .Chart.Name }}
+ securityContext:
+{{- toYaml .Values.securityContext | nindent 12 }}
+ image: "{{ .Values.apisix.image.repository }}:{{
.Values.apisix.image.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.apisix.image.pullPolicy }}
+ ports:
+- name: http
+ containerPort: {{ .Values.gateway.http.containerPort }}
+ protocol: TCP
+- name: tls
+ containerPort: {{ .Values.gateway.tls.containerPort }}
+ protocol: TCP
+{{- if .Values.admin.enabled }}
+- name: admin
+ containerPort: {{ .Values.admin.port }}
+ protocol: TCP
+{{- end }}
+{{- if .Values.serviceMonitor.enabled }}
+- name: prometheus
+ containerPort: {{ .Values.serviceMonitor.containerPort }}
+ protocol: TCP
+{{- end }}
+{{- if and .Values.gateway.stream.enabled (or (gt (len
.Values.gateway.stream.tcp) 0) (gt (len .Values.gateway.stream.udp) 0)) }}
+{{- with .Values.gateway.stream }}
+{{- if (gt (len .tcp) 0) }}
+{{- range $index, $port := .tcp }}
+- name: proxy-tcp-{{ $index | toString }}
+ containerPort: {{ $port }}
+ protocol: TCP
+{{- end }}
+{{- end }}
+{{- if (gt (len .udp) 0) }}
+{{- range $index, $port := .udp }}
+- name: proxy-udp-{{ $index | toString }}
+ containerPort: {{ $port }}
+ protocol: UDP
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+ readinessProbe:
+failureThreshold: 6
+initialDelaySeconds: 10
+periodSeconds: 10
+successThreshold: 1
+tcpSocket:
+ port: {{ .Values.gateway.http.containerPort }}
+timeoutSeconds: 1
+ lifecycle:
+preStop:
+ exec:
+command:
+- /bin/sh
+- -c
+- "sleep 30"
+ env:
+- name: INTRANET_IP
Review comment:
enable `skywalking` feature, diff instance.
i add `Deployment` env attriubte
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
PGDream commented on a change in pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r833064284
##
File path: charts/apisix/templates/daemonset.yaml
##
@@ -0,0 +1,201 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+{{- if eq .Values.apisix.kind "DaemonSet" }}
+{{- if .Values.apisix.enabled }}
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+ name: {{ include "apisix.fullname" . }}
+ namespace: {{ .Release.Namespace }}
+ labels:
+{{- include "apisix.labels" . | nindent 4 }}
+spec:
+ selector:
+matchLabels:
+ {{- include "apisix.selectorLabels" . | nindent 6 }}
+ template:
+metadata:
+ annotations:
+checksum/config: {{ include (print $.Template.BasePath
"/configmap.yaml") . | sha256sum }}
+{{- with .Values.apisix.podAnnotations }}
+{{- toYaml . | nindent 8 }}
+{{- end }}
+ labels:
+{{- include "apisix.selectorLabels" . | nindent 8 }}
+spec:
+ {{- with .Values.global.imagePullSecrets }}
+ imagePullSecrets:
+{{- toYaml . | nindent 8 }}
+ {{- end }}
+ securityContext:
+{{- toYaml .Values.podSecurityContext | nindent 8 }}
+ containers:
+- name: {{ .Chart.Name }}
+ securityContext:
+{{- toYaml .Values.securityContext | nindent 12 }}
+ image: "{{ .Values.apisix.image.repository }}:{{
.Values.apisix.image.tag | default .Chart.AppVersion }}"
+ imagePullPolicy: {{ .Values.apisix.image.pullPolicy }}
+ ports:
+- name: http
+ containerPort: {{ .Values.gateway.http.containerPort }}
+ protocol: TCP
+- name: tls
+ containerPort: {{ .Values.gateway.tls.containerPort }}
+ protocol: TCP
+{{- if .Values.admin.enabled }}
+- name: admin
+ containerPort: {{ .Values.admin.port }}
+ protocol: TCP
+{{- end }}
+{{- if .Values.serviceMonitor.enabled }}
+- name: prometheus
+ containerPort: {{ .Values.serviceMonitor.containerPort }}
+ protocol: TCP
+{{- end }}
+{{- if and .Values.gateway.stream.enabled (or (gt (len
.Values.gateway.stream.tcp) 0) (gt (len .Values.gateway.stream.udp) 0)) }}
+{{- with .Values.gateway.stream }}
+{{- if (gt (len .tcp) 0) }}
+{{- range $index, $port := .tcp }}
+- name: proxy-tcp-{{ $index | toString }}
+ containerPort: {{ $port }}
+ protocol: TCP
+{{- end }}
+{{- end }}
+{{- if (gt (len .udp) 0) }}
+{{- range $index, $port := .udp }}
+- name: proxy-udp-{{ $index | toString }}
+ containerPort: {{ $port }}
+ protocol: UDP
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+ readinessProbe:
+failureThreshold: 6
+initialDelaySeconds: 10
+periodSeconds: 10
+successThreshold: 1
+tcpSocket:
+ port: {{ .Values.gateway.http.containerPort }}
+timeoutSeconds: 1
+ lifecycle:
+preStop:
+ exec:
+command:
+- /bin/sh
+- -c
+- "sleep 30"
+ env:
+- name: INTRANET_IP
+ valueFrom:
+fieldRef:
+ fieldPath: status.podIP
+ volumeMounts:
+{{- if .Values.apisix.setIDFromPodUID }}
+- mountPath: /usr/local/apisix/conf/apisix.uid
+ name: id
+ subPath: apisix.uid
+{{- end }}
+- mountPath: /usr/local/apisix/conf/config.yaml
+ name: apisix-config
+ subPath: config.yaml
+{{- if and .Values.gateway.tls.enabled
.Values.gateway.tls.existingCASecret }}
+- mountPath: /usr/local/apisix/conf/ssl/{{
.Values.gateway.tls.certCAFilename }}
+ name: ssl
+ subPath: {{ .Values.gateway.tls.certCAFilename }}
+{{- end }}
+{{- if .Values.etcd.auth
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
PGDream commented on a change in pull request #257: URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r833017395 ## File path: .idea/workspace.xml ## @@ -0,0 +1,69 @@ + Review comment: .gitignore file add `.idea` option -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
PGDream commented on a change in pull request #257: URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r833015018 ## File path: .idea/workspace.xml ## @@ -0,0 +1,69 @@ + Review comment: can add at .gitignore? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
PGDream commented on a change in pull request #257: URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r833014510 ## File path: .idea/workspace.xml ## @@ -0,0 +1,69 @@ + Review comment: o -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@apisix.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
