You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by GitBox <gi...@apache.org> on 2022/03/23 08:54:49 UTC
[GitHub] [apisix-helm-chart] PGDream opened a new pull request #257: Daemonset
PGDream opened a new pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257
apisix chart support `DaemonSet` or `Deployment` , at deamonset.yaml delete podAffinity and nodeSelector;
delete Daemonset podAntiAffinity attribute, because Daemonset clear POD scheduler to k8s worker node
--
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] tokers commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
tokers commented on a change in pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r835993042
##########
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.tls.enabled }}
+ - mountPath: /etcd-ssl
+ name: etcd-ssl
+ {{- end }}
+ {{- if .Values.customPlugins.enabled }}
+ {{- range $plugin := .Values.customPlugins.plugins }}
+ {{- range $mount := $plugin.configMap.mounts }}
+ - mountPath: {{ $mount.path }}
+ name: plugin-{{ $plugin.configMap.name }}
+ subPath: {{ $mount.key }}
+ {{- end }}
+ {{- end }}
+ {{- end }}
+ {{- if .Values.apisix.luaModuleHook.enabled }}
+ {{- range $mount := .Values.apisix.luaModuleHook.configMapRef.mounts }}
+ - mountPath: {{ $mount.path }}
+ name: lua-module-hook
+ subPath: {{ $mount.key }}
+ {{- end }}
+ {{- end }}
+ {{- if .Values.extraVolumeMounts }}
+ {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
+ {{- end }}
+ resources:
+ {{- toYaml .Values.apisix.resources | nindent 12 }}
+ {{- if .Values.etcd.enabled }}
+ initContainers:
+ - name: wait-etcd
+ image: busybox:1.28
+ command: ['sh', '-c', "until nc -z {{ .Release.Name }}-etcd.{{ .Release.Namespace }}.svc.{{ .Values.etcd.clusterDomain }} {{ .Values.etcd.service.port }}; do echo waiting for etcd `date`; sleep 2; done;"]
+ {{- end }}
+ volumes:
+ - configMap:
+ name: {{ include "apisix.fullname" . }}
+ name: apisix-config
+ {{- if and .Values.gateway.tls.enabled .Values.gateway.tls.existingCASecret }}
+ - secret:
+ secretName: {{ .Values.gateway.tls.existingCASecret | quote }}
+ name: ssl
+ {{- end }}
+ {{- if .Values.etcd.auth.tls.enabled }}
+ - secret:
+ secretName: {{ .Values.etcd.auth.tls.existingSecret | quote }}
+ name: etcd-ssl
+ {{- end }}
+ {{- if .Values.apisix.setIDFromPodUID }}
+ - downwardAPI:
+ items:
+ - path: "apisix.uid"
+ fieldRef:
+ fieldPath: metadata.uid
+ name: id
+ {{- end }}
+ {{- if .Values.customPlugins.enabled }}
+ {{- range $plugin := .Values.customPlugins.plugins }}
+ - name: plugin-{{ $plugin.configMap.name }}
+ configMap:
+ name: {{ $plugin.configMap.name }}
+ {{- end }}
+ {{- end }}
+ {{- if .Values.apisix.luaModuleHook.enabled }}
+ - name: lua-module-hook
+ configMap:
+ name: {{ .Values.apisix.luaModuleHook.configMapRef.name }}
+ {{- end }}
+ {{- if .Values.extraVolumes }}
+ {{- toYaml .Values.extraVolumes | nindent 8 }}
+ {{- end }}
+ {{- with .Values.apisix.nodeSelector }}
+ nodeSelector:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ affinity:
+ {{- with .Values.apisix.affinity }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{- with .Values.apisix.tolerations }}
+ tolerations:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+{{- end }}
+{{- end }}
Review comment:
Still miss the EOL symbol @PGDream
--
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] Gallardot commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
Gallardot commented on a change in pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r834241987
##########
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:
But I can't find any use of this environment variable on either `skywalking-logger` plugin or `skywalking` plugin.
--
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] tokers commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
tokers commented on a change in pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r834080423
##########
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:
But who uses this environment variable?
--
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] tokers commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
tokers commented on a change in pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r835991858
##########
File path: .idea/workspace.xml
##########
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
Review comment:
It' still there, tracked by git.
--
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] Gallardot commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
Gallardot commented on a change in pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r833050136
##########
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:
Does `DaemonSet` need this? `Deployment` doesn't have that.
##########
File path: charts/apisix/templates/deployment.yaml
##########
@@ -209,3 +209,4 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
+{{- end }}
Review comment:
ditto
##########
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.tls.enabled }}
+ - mountPath: /etcd-ssl
+ name: etcd-ssl
+ {{- end }}
+ {{- if .Values.customPlugins.enabled }}
+ {{- range $plugin := .Values.customPlugins.plugins }}
+ {{- range $mount := $plugin.configMap.mounts }}
+ - mountPath: {{ $mount.path }}
+ name: plugin-{{ $plugin.configMap.name }}
+ subPath: {{ $mount.key }}
+ {{- end }}
+ {{- end }}
+ {{- end }}
+ {{- if .Values.apisix.luaModuleHook.enabled }}
+ {{- range $mount := .Values.apisix.luaModuleHook.configMapRef.mounts }}
+ - mountPath: {{ $mount.path }}
+ name: lua-module-hook
+ subPath: {{ $mount.key }}
+ {{- end }}
+ {{- end }}
+ {{- if .Values.extraVolumeMounts }}
+ {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
+ {{- end }}
+ resources:
+ {{- toYaml .Values.apisix.resources | nindent 12 }}
+ {{- if .Values.etcd.enabled }}
+ initContainers:
+ - name: wait-etcd
+ image: busybox:1.28
+ command: ['sh', '-c', "until nc -z {{ .Release.Name }}-etcd.{{ .Release.Namespace }}.svc.{{ .Values.etcd.clusterDomain }} {{ .Values.etcd.service.port }}; do echo waiting for etcd `date`; sleep 2; done;"]
+ {{- end }}
+ volumes:
+ - configMap:
+ name: {{ include "apisix.fullname" . }}
+ name: apisix-config
+ {{- if and .Values.gateway.tls.enabled .Values.gateway.tls.existingCASecret }}
+ - secret:
+ secretName: {{ .Values.gateway.tls.existingCASecret | quote }}
+ name: ssl
+ {{- end }}
+ {{- if .Values.etcd.auth.tls.enabled }}
+ - secret:
+ secretName: {{ .Values.etcd.auth.tls.existingSecret | quote }}
+ name: etcd-ssl
+ {{- end }}
+ {{- if .Values.apisix.setIDFromPodUID }}
+ - downwardAPI:
+ items:
+ - path: "apisix.uid"
+ fieldRef:
+ fieldPath: metadata.uid
+ name: id
+ {{- end }}
+ {{- if .Values.customPlugins.enabled }}
+ {{- range $plugin := .Values.customPlugins.plugins }}
+ - name: plugin-{{ $plugin.configMap.name }}
+ configMap:
+ name: {{ $plugin.configMap.name }}
+ {{- end }}
+ {{- end }}
+ {{- if .Values.apisix.luaModuleHook.enabled }}
+ - name: lua-module-hook
+ configMap:
+ name: {{ .Values.apisix.luaModuleHook.configMapRef.name }}
+ {{- end }}
+ {{- if .Values.extraVolumes }}
+ {{- toYaml .Values.extraVolumes | nindent 8 }}
+ {{- end }}
+ {{- with .Values.apisix.nodeSelector }}
+ nodeSelector:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ affinity:
+ {{- with .Values.apisix.affinity }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{- with .Values.apisix.tolerations }}
+ tolerations:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+{{- end }}
+{{- end }}
Review comment:
We may need a new line here
--
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
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.tls.enabled }}
+ - mountPath: /etcd-ssl
+ name: etcd-ssl
+ {{- end }}
+ {{- if .Values.customPlugins.enabled }}
+ {{- range $plugin := .Values.customPlugins.plugins }}
+ {{- range $mount := $plugin.configMap.mounts }}
+ - mountPath: {{ $mount.path }}
+ name: plugin-{{ $plugin.configMap.name }}
+ subPath: {{ $mount.key }}
+ {{- end }}
+ {{- end }}
+ {{- end }}
+ {{- if .Values.apisix.luaModuleHook.enabled }}
+ {{- range $mount := .Values.apisix.luaModuleHook.configMapRef.mounts }}
+ - mountPath: {{ $mount.path }}
+ name: lua-module-hook
+ subPath: {{ $mount.key }}
+ {{- end }}
+ {{- end }}
+ {{- if .Values.extraVolumeMounts }}
+ {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
+ {{- end }}
+ resources:
+ {{- toYaml .Values.apisix.resources | nindent 12 }}
+ {{- if .Values.etcd.enabled }}
+ initContainers:
+ - name: wait-etcd
+ image: busybox:1.28
+ command: ['sh', '-c', "until nc -z {{ .Release.Name }}-etcd.{{ .Release.Namespace }}.svc.{{ .Values.etcd.clusterDomain }} {{ .Values.etcd.service.port }}; do echo waiting for etcd `date`; sleep 2; done;"]
+ {{- end }}
+ volumes:
+ - configMap:
+ name: {{ include "apisix.fullname" . }}
+ name: apisix-config
+ {{- if and .Values.gateway.tls.enabled .Values.gateway.tls.existingCASecret }}
+ - secret:
+ secretName: {{ .Values.gateway.tls.existingCASecret | quote }}
+ name: ssl
+ {{- end }}
+ {{- if .Values.etcd.auth.tls.enabled }}
+ - secret:
+ secretName: {{ .Values.etcd.auth.tls.existingSecret | quote }}
+ name: etcd-ssl
+ {{- end }}
+ {{- if .Values.apisix.setIDFromPodUID }}
+ - downwardAPI:
+ items:
+ - path: "apisix.uid"
+ fieldRef:
+ fieldPath: metadata.uid
+ name: id
+ {{- end }}
+ {{- if .Values.customPlugins.enabled }}
+ {{- range $plugin := .Values.customPlugins.plugins }}
+ - name: plugin-{{ $plugin.configMap.name }}
+ configMap:
+ name: {{ $plugin.configMap.name }}
+ {{- end }}
+ {{- end }}
+ {{- if .Values.apisix.luaModuleHook.enabled }}
+ - name: lua-module-hook
+ configMap:
+ name: {{ .Values.apisix.luaModuleHook.configMapRef.name }}
+ {{- end }}
+ {{- if .Values.extraVolumes }}
+ {{- toYaml .Values.extraVolumes | nindent 8 }}
+ {{- end }}
+ {{- with .Values.apisix.nodeSelector }}
+ nodeSelector:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ affinity:
+ {{- with .Values.apisix.affinity }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{- with .Values.apisix.tolerations }}
+ tolerations:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+{{- end }}
+{{- end }}
Review comment:
yes, i merge `.Values.apisix.enabled` condation
--
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] tao12345666333 commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
tao12345666333 commented on a change in pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r833013118
##########
File path: .idea/workspace.xml
##########
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
Review comment:
Please remove this file. Thanks
--
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] Gallardot commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
Gallardot commented on a change in pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r835024707
##########
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:
I don't think this environment variable is a necessary option. If you need it in your scenario, you can add it after this [PR](https://github.com/apache/apisix-helm-chart/pull/232) is merged
--
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] tokers commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
tokers commented on a change in pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r833830507
##########
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:
@PGDream Sorry, cannot understand what you expressed. Could you describe it more elaborately?
--
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] tao12345666333 commented on pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
tao12345666333 commented on pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#issuecomment-1076115990
cool! thanks！
--
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] tokers commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
tokers commented on a change in pull request #257:
URL: https://github.com/apache/apisix-helm-chart/pull/257#discussion_r834872377
##########
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:
@PGDream Could you give us a link about this?
--
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-helm-chart] PGDream commented on a change in pull request #257: Daemonset
Posted by GitBox <gi...@apache.org>.
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-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org