This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
The following commit(s) were added to refs/heads/main by this push:
new df0e2e3 Support deploy cilium related services (#181)
df0e2e3 is described below
commit df0e2e3880cbf29e21e0558b09d3738cd0bfb7e9
Author: mrproliu <[email protected]>
AuthorDate: Mon Jul 8 13:52:16 2024 +0000
Support deploy cilium related services (#181)
---
Makefile.in | 4 +-
deploy/platform/kubernetes/Makefile | 20 +-
deploy/platform/kubernetes/Makefile.in | 1 +
.../templates/feature-ciilum/policy.yaml | 309 ++++++++++
.../templates/feature-ciilum/resources.yaml | 625 +++++++++++++++++++++
deploy/platform/kubernetes/values.yaml | 19 +
docs/readme.md | 1 +
7 files changed, 976 insertions(+), 3 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 6aa13a7..695a7f9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,10 +33,10 @@ ES_IMAGE ?=
docker.elastic.co/elasticsearch/elasticsearch-oss
ES_IMAGE_TAG ?= 7.10.2
SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap
-SW_OAP_IMAGE_TAG ?= 3acad529f5cdbb44060bc0ef3d49fe7bc080cbe8
+SW_OAP_IMAGE_TAG ?= 97f015ba4d62efcfcb86bcf7e90292f4b1d8e82d
SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui
-SW_UI_IMAGE_TAG ?= 3acad529f5cdbb44060bc0ef3d49fe7bc080cbe8
+SW_UI_IMAGE_TAG ?= 97f015ba4d62efcfcb86bcf7e90292f4b1d8e82d
SW_CLI_IMAGE ?=
ghcr.io/apache/skywalking-cli/skywalking-cli:0883266bfaa36612927b69e35781b64ea181758d
SW_EVENT_EXPORTER_IMAGE ?=
ghcr.io/apache/skywalking-kubernetes-event-exporter/skywalking-kubernetes-event-exporter:8a012a3f968cb139f817189afb9b3748841bba22
diff --git a/deploy/platform/kubernetes/Makefile
b/deploy/platform/kubernetes/Makefile
index 0979110..33151b7 100644
--- a/deploy/platform/kubernetes/Makefile
+++ b/deploy/platform/kubernetes/Makefile
@@ -45,6 +45,7 @@ HELM_OPTIONS := $(HELM_OPTIONS) --set
skywalking.ui.env.SW_ZIPKIN_ADDRESS=http:/
HELM_OPTIONS := $(HELM_OPTIONS) --set
skywalking.satellite.image.repository=$(SW_SATELLITE_IMAGE) --set
skywalking.satellite.image.tag=$(SW_SATELLITE_IMAGE_TAG)
HELM_OPTIONS := $(HELM_OPTIONS) --set
swck.image.repository=$(SWCK_OPERATOR_IMAGE) --set
swck.image.tag=$(SWCK_OPERATOR_IMAGE_TAG)
HELM_OPTIONS := $(HELM_OPTIONS) --set sampleServices.hub=$(HUB) --set
sampleServices.tag=$(TAG) --set
sampleServices.namespace=$(SAMPLE_SERVICES_NAMESPACE)
+HELM_OPTIONS := $(HELM_OPTIONS) --set ciliumServices.hub=$(HUB) --set
ciliumServices.tag=$(TAG) --set
ciliumServices.namespace=$(CILIUM_SERVICES_NAMESPACE)
HELM_OPTIONS := $(HELM_OPTIONS) --set
opentelemetry-collector.image.repository=$(OTEL_COLLECTOR_IMAGE) --set
opentelemetry-collector.image.tag=$(OTEL_COLLECTOR_IMAGE_TAG)
HELM_OPTIONS := $(HELM_OPTIONS) --set
features.rover.swctl.image=$(SW_CLI_IMAGE)
HELM_OPTIONS := $(HELM_OPTIONS) --set
features.traceProfiling.swctl.image=$(SW_CLI_IMAGE)
@@ -211,6 +212,20 @@ feature-activemq-monitor:
$(eval HELM_OPTIONS := $(HELM_OPTIONS) --set
features.activemqMonitor.enabled=true)
$(eval HELM_OPTIONS := $(HELM_OPTIONS) --set opentelemetry.enabled=true)
+.PHONY: cilium
+cilium:
+ifeq (, $(shell which cilium))
+ $(error "No cilium in PATH, please make sure cilium CLI is available in
PATH")
+endif
+ @INSTALL_OR_UPDATE=$$(cilium status 2>&1 | grep -q "daemonsets.apps
\"cilium\" not found" && echo "install" || echo "upgrade"); \
+ echo "Cilium will be $$INSTALL_OR_UPDATE"; \
+ cilium $$INSTALL_OR_UPDATE --set cni.exclusive=false --set
socketLB.hostNamespaceOnly=true --set hubble.tls.enabled=false
+
+# @feature: function; install open function resources
+.PHONY: feature-cilium
+feature-cilium: cilium
+ $(eval HELM_OPTIONS := $(HELM_OPTIONS) --set
features.cilium.enabled=true --set skywalking.oap.env.SW_CILIUM_FETCHER=default)
+
.PHONY: deploy
deploy: $(features)
helm dep up .
@@ -222,4 +237,7 @@ endif
.PHONY: undeploy
undeploy:
- helm -n $(NAMESPACE) delete $(RELEASE)
+ helm -n $(NAMESPACE) delete $(RELEASE) --wait
+ifneq ($(findstring cilium,$(FEATURE_FLAGS)),)
+ cilium uninstall
+endif
diff --git a/deploy/platform/kubernetes/Makefile.in
b/deploy/platform/kubernetes/Makefile.in
index 1aa644a..3f78e7e 100644
--- a/deploy/platform/kubernetes/Makefile.in
+++ b/deploy/platform/kubernetes/Makefile.in
@@ -20,6 +20,7 @@
NAMESPACE ?= skywalking-showcase
SAMPLE_SERVICES_NAMESPACE ?= sample-services
+CILIUM_SERVICES_NAMESPACE ?= cilium-services
RELEASE ?= demo
AGENTLESS ?= false
diff --git a/deploy/platform/kubernetes/templates/feature-ciilum/policy.yaml
b/deploy/platform/kubernetes/templates/feature-ciilum/policy.yaml
new file mode 100644
index 0000000..4c128a7
--- /dev/null
+++ b/deploy/platform/kubernetes/templates/feature-ciilum/policy.yaml
@@ -0,0 +1,309 @@
+# 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 .Values.features.cilium.enabled }}
+
+---
+
+apiVersion: "cilium.io/v2"
+kind: CiliumNetworkPolicy
+metadata:
+ name: "recommendation"
+ namespace: {{ .Values.ciliumServices.namespace }}
+spec:
+ endpointSelector:
+ matchLabels:
+ app: recommendation
+ ingress:
+ - fromEndpoints:
+ - matchLabels:
+ "k8s:app": rating
+ - matchLabels:
+ "k8s:app": songs
+ - matchLabels:
+ "k8s:app": gateway
+ - matchLabels:
+ "k8s:app": demo
+ "k8s:component": satellite
+ egress:
+ - toEndpoints:
+ - matchLabels:
+ "k8s:io.kubernetes.pod.namespace": kube-system
+ "k8s:k8s-app": kube-dns
+ toPorts:
+ - ports:
+ - port: "53"
+ protocol: ANY
+ rules:
+ dns:
+ - matchPattern: "*"
+ - toEndpoints:
+ - matchLabels:
+ "k8s:app": rating
+ - matchLabels:
+ "k8s:app": songs
+ - matchLabels:
+ "k8s:app": gateway
+ - matchLabels:
+ "k8s:component": satellite
+ toPorts:
+ - ports:
+ - port: "80"
+ protocol: TCP
+ rules:
+ http:
+ - method: ""
+ path: ""
+
+---
+
+apiVersion: "cilium.io/v2"
+kind: CiliumNetworkPolicy
+metadata:
+ name: "gateway"
+ namespace: {{ .Values.ciliumServices.namespace }}
+spec:
+ endpointSelector:
+ matchLabels:
+ app: gateway
+ ingress:
+ - fromEndpoints:
+ - matchLabels:
+ "k8s:app": recommendation
+ - matchLabels:
+ "k8s:app": songs
+ - matchLabels:
+ "k8s:app": app
+ - matchLabels:
+ "k8s:app": demo
+ "k8s:component": satellite
+ egress:
+ - toEndpoints:
+ - matchLabels:
+ "k8s:io.kubernetes.pod.namespace": kube-system
+ "k8s:k8s-app": kube-dns
+ toPorts:
+ - ports:
+ - port: "53"
+ protocol: ANY
+ rules:
+ dns:
+ - matchPattern: "*"
+ - toEndpoints:
+ - matchLabels:
+ "k8s:app": recommendation
+ - matchLabels:
+ "k8s:app": songs
+ - matchLabels:
+ "k8s:app": app
+ - matchLabels:
+ "k8s:component": satellite
+ toPorts:
+ - ports:
+ - port: "80"
+ protocol: TCP
+ rules:
+ http:
+ - method: ""
+ path: ""
+
+---
+
+apiVersion: "cilium.io/v2"
+kind: CiliumNetworkPolicy
+metadata:
+ name: "app"
+ namespace: {{ .Values.ciliumServices.namespace }}
+spec:
+ endpointSelector:
+ matchLabels:
+ app: app
+ ingress:
+ - fromEndpoints:
+ - matchLabels:
+ "k8s:app": frontend
+ - matchLabels:
+ "k8s:app": gateway
+ - matchLabels:
+ "k8s:app": demo
+ "k8s:component": satellite
+ - matchLabels:
+ "k8s:app": demo
+ "k8s:component": oap
+ egress:
+ - toEndpoints:
+ - matchLabels:
+ "k8s:io.kubernetes.pod.namespace": kube-system
+ "k8s:k8s-app": kube-dns
+ toPorts:
+ - ports:
+ - port: "53"
+ protocol: ANY
+ rules:
+ dns:
+ - matchPattern: "*"
+ - toEndpoints:
+ - matchLabels:
+ "k8s:app": frontend
+ - matchLabels:
+ "k8s:app": gateway
+ - matchLabels:
+ "k8s:component": satellite
+ - matchLabels:
+ "k8s:app": demo
+ "k8s:component": oap
+ toPorts:
+ - ports:
+ - port: "80"
+ protocol: TCP
+ rules:
+ http:
+ - method: ""
+ path: ""
+ - ports:
+ - port: "11800"
+ protocol: TCP
+
+---
+
+apiVersion: "cilium.io/v2"
+kind: CiliumNetworkPolicy
+metadata:
+ name: "loadgen"
+ namespace: {{ .Values.ciliumServices.namespace }}
+spec:
+ endpointSelector:
+ matchLabels:
+ app: loadgen
+ ingress:
+ - fromEndpoints:
+ - matchLabels:
+ "k8s:app": frontend
+ - matchLabels:
+ "k8s:app": demo
+ "k8s:component": satellite
+ - matchLabels:
+ "k8s:app": demo
+ "k8s:component": oap
+ egress:
+ - toEndpoints:
+ - matchLabels:
+ "k8s:io.kubernetes.pod.namespace": kube-system
+ "k8s:k8s-app": kube-dns
+ toPorts:
+ - ports:
+ - port: "53"
+ protocol: ANY
+ rules:
+ dns:
+ - matchPattern: "*"
+ - toEndpoints:
+ - matchLabels:
+ "k8s:app": frontend
+ - matchLabels:
+ "k8s:component": satellite
+ - matchLabels:
+ "k8s:component": oap
+ toPorts:
+ - ports:
+ - port: "80"
+ protocol: TCP
+ rules:
+ http:
+ - method: ""
+ path: ""
+ - ports:
+ - port: "11800"
+ protocol: TCP
+ - ports:
+ - port: "12800"
+ protocol: TCP
+ rules:
+ http:
+ - method: ""
+ path: ""
+
+---
+
+apiVersion: "cilium.io/v2"
+kind: CiliumNetworkPolicy
+metadata:
+ name: "frontend"
+ namespace: {{ .Values.ciliumServices.namespace }}
+spec:
+ endpointSelector:
+ matchLabels:
+ app: frontend
+ ingress:
+ - fromEndpoints:
+ - matchLabels:
+ "k8s:app": loadgen
+ - matchLabels:
+ "k8s:app": app
+ - matchLabels:
+ "k8s:app": demo
+ "k8s:component": satellite
+ - matchLabels:
+ "k8s:app": demo
+ "k8s:component": oap
+ - matchLabels:
+ "k8s:app.kubernetes.io/name": opentelemetry-collector
+ "k8s:component": standalone-collector
+ egress:
+ - toEndpoints:
+ - matchLabels:
+ "k8s:io.kubernetes.pod.namespace": kube-system
+ "k8s:k8s-app": kube-dns
+ toPorts:
+ - ports:
+ - port: "53"
+ protocol: ANY
+ rules:
+ dns:
+ - matchPattern: "*"
+ - toEndpoints:
+ - matchLabels:
+ "k8s:app": loadgen
+ - matchLabels:
+ "k8s:app": app
+ - matchLabels:
+ "k8s:app": demo
+ "k8s:component": satellite
+ - matchLabels:
+ "k8s:app": demo
+ "k8s:component": oap
+ - matchLabels:
+ "k8s:app.kubernetes.io/name": opentelemetry-collector
+ "k8s:component": standalone-collector
+ toPorts:
+ - ports:
+ - port: "80"
+ protocol: TCP
+ rules:
+ http:
+ - method: ""
+ path: ""
+ - ports:
+ - port: "11800"
+ protocol: TCP
+ - port: "12800"
+ protocol: TCP
+ - port: "4318"
+ protocol: TCP
+
+{{- end }}
+
diff --git a/deploy/platform/kubernetes/templates/feature-ciilum/resources.yaml
b/deploy/platform/kubernetes/templates/feature-ciilum/resources.yaml
new file mode 100644
index 0000000..c8c6770
--- /dev/null
+++ b/deploy/platform/kubernetes/templates/feature-ciilum/resources.yaml
@@ -0,0 +1,625 @@
+# 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 .Values.features.cilium.enabled }}
+
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+ name: {{ .Values.ciliumServices.namespace }}
+ labels:
+ {{- if .Values.features.javaAgentInjector.enabled }}
+ swck-injection: enabled
+ {{- end }}
+ istio-injection: disabled
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: gateway
+ namespace: {{ .Values.ciliumServices.namespace }}
+spec:
+ selector:
+ app: gateway
+ ports:
+ - protocol: TCP
+ port: 80
+ targetPort: 80
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: gateway-deployment
+ namespace: {{ .Values.ciliumServices.namespace }}
+ labels:
+ app: gateway
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: gateway
+ template:
+ metadata:
+ labels:
+ # @feature: java-agent-injector; enable the java agent injector
+ swck-java-agent-injected: "true"
+ app: gateway
+ annotations:
+ # @feature: java-agent-injector; set the java agent configuration
+ strategy.skywalking.apache.org/inject.Container: "gateway"
+ strategy.skywalking.apache.org/agent.Overlay: "true"
+ agent.skywalking.apache.org/agent.service_name: "agent::gateway"
+ optional.skywalking.apache.org: "spring-cloud-gateway-3.x"
+ sidecar.skywalking.apache.org/initcontainer.Image: "{{
.Values.features.javaAgentInjector.agentImage }}"
+ spec:
+ containers:
+ - name: gateway
+ {{- if .Values.features.javaAgentInjector.enabled }}
+ # @feature: java-agent-injector; if the java agent injector is
enabled, we use the agentless image and let the injector inject the agent.
+ image: "{{ .Values.ciliumServices.hub }}/gateway-service:{{
.Values.ciliumServices.tag }}-agentless"
+ {{- else }}
+ image: "{{ .Values.ciliumServices.hub }}/gateway-service:{{
.Values.ciliumServices.tag }}"
+ {{- end }}
+ imagePullPolicy: IfNotPresent
+ ports:
+ - containerPort: 80
+ # @feature: agent; set env to configure java agent, If we use
injector, we don't need to set env, only to configure java gent through
annotation
+ env:
+ - name: SW_AGENT_NAME
+ value: agent::gateway
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: {{ template "skywalking.collector.address" . }}
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: songs
+ namespace: {{ .Values.ciliumServices.namespace }}
+spec:
+ selector:
+ app: songs
+ ports:
+ - protocol: TCP
+ port: 80
+ targetPort: 80
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: songs-deployment
+ namespace: {{ .Values.ciliumServices.namespace }}
+ labels:
+ app: songs
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: songs
+ template:
+ metadata:
+ labels:
+ # @feature: java-agent-injector; enable the java agent injector
+ swck-java-agent-injected: "true"
+ app: songs
+ annotations:
+ # @feature: java-agent-injector; set the java agent configuration
+ strategy.skywalking.apache.org/inject.Container: "songs"
+ strategy.skywalking.apache.org/agent.Overlay: "true"
+ agent.skywalking.apache.org/agent.service_name: "agent::songs"
+ optional.skywalking.apache.org: "guava-cache-plugin"
+ sidecar.skywalking.apache.org/initcontainer.Image: "{{
.Values.features.javaAgentInjector.agentImage }}"
+ spec:
+ containers:
+ - name: songs
+ {{- if .Values.features.javaAgentInjector.enabled }}
+ # @feature: java-agent-injector; if the java agent injector is
enabled, we use the agentless image and let the injector inject the agent.
+ image: "{{ .Values.ciliumServices.hub }}/songs-service:{{
.Values.ciliumServices.tag }}-agentless"
+ {{- else }}
+ image: "{{ .Values.ciliumServices.hub }}/songs-service:{{
.Values.ciliumServices.tag }}"
+ {{- end }}
+ imagePullPolicy: IfNotPresent
+ ports:
+ - containerPort: 80
+ # @feature: agent; set env to configure java agent, If we use
injector, we don't need to set env, only need to configure java agent through
annotation
+ env:
+ - name: SW_AGENT_NAME
+ value: agent::songs
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: {{ template "skywalking.collector.address" . }}
+ - name: ACTIVE_MQ_URL
+ value: tcp://activemq:61616
+ - name: ACTIVE_MQ_QUEUE
+ value: queue-songs-ping
+ {{- if .Values.features.postgresqlMonitor.enabled }}
+ - name: DATA_SOURCE_URL
+ value: jdbc:postgresql://psql.{{ .Release.Namespace
}}.svc.cluster.local:5432/postgres
+ - name: DATA_SOURCE_USER
+ value: postgres
+ - name: DATA_SOURCE_PASSWORD
+ value: password
+ {{- end }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: rcmd
+ namespace: {{ .Values.ciliumServices.namespace }}
+spec:
+ selector:
+ app: recommendation
+ ports:
+ - protocol: TCP
+ port: 80
+ targetPort: 80
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: recommendation-deployment
+ namespace: {{ .Values.ciliumServices.namespace }}
+ labels:
+ app: recommendation
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: recommendation
+ template:
+ metadata:
+ labels:
+ app: recommendation
+ spec:
+ containers:
+ - name: recommendation
+ image: "{{ .Values.ciliumServices.hub }}/recommendation-service:{{
.Values.ciliumServices.tag }}"
+ imagePullPolicy: IfNotPresent
+ ports:
+ - containerPort: 80
+ env:
+ - name: SW_AGENT_NAME
+ value: agent::recommendation
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: {{ template "skywalking.collector.address" . }}
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: app
+ namespace: {{ .Values.ciliumServices.namespace }}
+spec:
+ selector:
+ app: app
+ ports:
+ - protocol: TCP
+ port: 80
+ targetPort: 80
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: app-deployment
+ namespace: {{ .Values.ciliumServices.namespace }}
+ labels:
+ app: app
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: app
+ template:
+ metadata:
+ labels:
+ app: app
+ spec:
+ containers:
+ - name: app
+ image: "{{ .Values.ciliumServices.hub }}/app:{{
.Values.ciliumServices.tag }}"
+ imagePullPolicy: IfNotPresent
+ ports:
+ - containerPort: 80
+ env:
+ - name: SW_AGENT_NAME_SERVER
+ value: agent::app
+ - name: REACT_APP_SW_AGENT_NAME_UI
+ value: agent::ui
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: {{ template "skywalking.collector.address" . }}
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: loadgen-deployment
+ namespace: {{ .Values.ciliumServices.namespace }}
+ labels:
+ app: loadgen
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: loadgen
+ template:
+ metadata:
+ labels:
+ app: loadgen
+ spec:
+ containers:
+ - name: app
+ image: "{{ .Values.ciliumServices.hub }}/load-gen:{{
.Values.ciliumServices.tag }}"
+ imagePullPolicy: IfNotPresent
+---
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: apisix-config
+ namespace: {{ .Values.ciliumServices.namespace }}
+ labels:
+ app: apisix-config
+data:
+ apisix: |
+ routes:
+ - uri: /browser/*
+ service_id: 1
+ - uri: /v3/*
+ service_id: 1
+ - uri: /homepage
+ service_id: 2
+ plugins:
+ skywalking:
+ service_name: ${{ "{{" }}SW_AGENT_SERVICE{{ "}}" }}
+ service_instance_name: ${{ "{{" }}SW_AGENT_SERVICE_INSTANCE{{ "}}"
}}
+ endpoint_addr: {{ template "skywalking.oap.address.http" . }}
+ - uri: /test
+ service_id: 2
+ plugins:
+ skywalking:
+ service_name: ${{"{{"}}SW_AGENT_SERVICE{{"}}"}}
+ service_instance_name: ${{"{{"}}SW_AGENT_SERVICE_INSTANCE{{"}}"}}
+ endpoint_addr: {{ template "skywalking.oap.address.http" . }}
+ services:
+ - id: 1
+ upstream_id: 1
+ - id: 2
+ upstream_id: 2
+
+ upstreams:
+ - id: 1
+ nodes:
+ "{{ template "skywalking.oap.address.host" . }}:12800": 1
+ type: roundrobin
+ - id: 2
+ nodes:
+ "app:80": 1
+ type: roundrobin
+
+ global_rules:
+ - id: 1
+ plugins:
+ prometheus:
+ export_addr:
+ ip: "0.0.0.0"
+ port: 9091
+ #END
+ config: |
+ apisix:
+ node_listen: 80
+ enable_ipv6: false
+ enable_admin: false
+ config_center: yaml
+ plugin_attr:
+ prometheus:
+ export_addr:
+ ip: "0.0.0.0"
+ port: 9091
+ skywalking:
+ service_name: ${{"{{"}}SW_AGENT_SERVICE{{"}}"}}
+ service_instance_name: ${{"{{"}}SW_AGENT_SERVICE_INSTANCE{{"}}"}}
+ endpoint_addr: {{ template "skywalking.oap.address.http" . }}
+ plugins:
+ - prometheus
+ - skywalking
+ nginx_config:
+ http_server_configuration_snippet: |
+ location ~ \.(gif|jpg|png|js|css|html)$ {
+ root /app/build;
+ index index.html;
+ }
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: activemq-config
+ namespace: {{ .Values.ciliumServices.namespace }}
+ labels:
+ app: activemq-config
+data:
+ activemq: |
+ <beans
+ xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core.xsd";>
+ <bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="locations">
+ <value>file:${activemq.conf}/credentials.properties</value>
+ </property>
+ </bean>
+ <broker xmlns="http://activemq.apache.org/schema/core";
brokerName="${ACTIVEMQ_BROKER_NAME}" dataDirectory="${activemq.data}">
+ <destinationPolicy>
+ <policyMap>
+ <policyEntries>
+ <policyEntry topic=">" >
+ <pendingMessageLimitStrategy>
+ <constantPendingMessageLimitStrategy limit="1000"/>
+ </pendingMessageLimitStrategy>
+ </policyEntry>
+ </policyEntries>
+ </policyMap>
+ </destinationPolicy>
+ <managementContext>
+ <managementContext createConnector="false"/>
+ </managementContext>
+ <persistenceAdapter>
+ <kahaDB directory="${activemq.data}/kahadb"/>
+ </persistenceAdapter>
+ <systemUsage>
+ <systemUsage>
+ <memoryUsage>
+ <memoryUsage percentOfJvmHeap="70" />
+ </memoryUsage>
+ <storeUsage>
+ <storeUsage limit="100 gb"/>
+ </storeUsage>
+ <tempUsage>
+ <tempUsage limit="50 gb"/>
+ </tempUsage>
+ </systemUsage>
+ </systemUsage>
+ <transportConnectors>
+ <transportConnector name="openwire"
uri="tcp://0.0.0.0:61616?maximumConnections=1000&wireFormat.maxFrameSize=104857600"/>
+ <transportConnector name="amqp"
uri="amqp://0.0.0.0:5672?maximumConnections=1000&wireFormat.maxFrameSize=104857600"/>
+ <transportConnector name="stomp"
uri="stomp://0.0.0.0:61613?maximumConnections=1000&wireFormat.maxFrameSize=104857600"/>
+ <transportConnector name="mqtt"
uri="mqtt://0.0.0.0:1883?maximumConnections=1000&wireFormat.maxFrameSize=104857600"/>
+ <transportConnector name="ws"
uri="ws://0.0.0.0:61614?maximumConnections=1000&wireFormat.maxFrameSize=104857600"/>
+ </transportConnectors>
+ <shutdownHooks>
+ <bean xmlns="http://www.springframework.org/schema/beans";
class="org.apache.activemq.hooks.SpringContextHook" />
+ </shutdownHooks>
+ </broker>
+ <import resource="jetty.xml"/>
+ </beans>
+ config: |
+ startDelaySeconds: 10
+ hostPort: localhost:1616
+ ssl: false
+ lowercaseOutputName: false
+ lowercaseOutputLabelNames: false
+ includeObjectNames:
["org.apache.activemq:*","java.lang:type=OperatingSystem","java.lang:type=GarbageCollector,*","java.lang:type=Threading","java.lang:type=Runtime","java.lang:type=Memory","java.lang:name=*"]
+ excludeObjectNames: ["org.apache.activemq:type=ColumnFamily,*"]
+ autoExcludeObjectNameAttributes: true
+ excludeObjectNameAttributes:
+ "java.lang:type=OperatingSystem":
+ - "ObjectName"
+ "java.lang:type=Runtime":
+ - "ClassPath"
+ - "SystemProperties"
+ rules:
+ - pattern: ".*"
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: frontend-deployment
+ namespace: {{ .Values.ciliumServices.namespace }}
+ labels:
+ app: frontend
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: frontend
+ template:
+ metadata:
+ labels:
+ app: frontend
+ spec:
+ containers:
+ - name: frontend
+ image: "{{ .Values.ciliumServices.hub }}/frontend:{{
.Values.ciliumServices.tag }}"
+ imagePullPolicy: IfNotPresent
+ resources:
+ limits:
+ cpu: 500m
+ memory: "256Mi"
+ requests:
+ cpu: 500m
+ memory: "256Mi"
+ ports:
+ - containerPort: 80
+ name: http
+ - containerPort: 9091 # APISIX Prometheus plugin port
+ name: metrics
+ env:
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: {{ template "skywalking.collector.address" . }}
+ - name: SW_SERVICE_INSTANCE
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.name
+ volumeMounts:
+ - name: apisix-config
+ mountPath: /usr/local/apisix/conf/config.yaml
+ subPath: config
+ - name: apisix-config
+ mountPath: /usr/local/apisix/conf/apisix.yaml
+ subPath: apisix
+ volumes:
+ - name: apisix-config
+ configMap:
+ name: apisix-config
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: frontend
+ namespace: {{ .Values.ciliumServices.namespace }}
+spec:
+ selector:
+ app: frontend
+ ports:
+ - protocol: TCP
+ port: 80
+ targetPort: 80
+---
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: activemq-deployment
+ namespace: {{ .Values.ciliumServices.namespace }}
+ labels:
+ app: activemq
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: activemq
+ template:
+ metadata:
+ labels:
+ app: activemq
+ annotations:
+ sidecar.istio.io/inject: "false"
+ spec:
+ containers:
+ - name: activemq
+ image: rmohr/activemq:5.15.9
+ imagePullPolicy: IfNotPresent
+ env:
+ - name: ACTIVEMQ_SUNJMX_START
+ value: "-Dcom.sun.management.jmxremote.port=1616
-Dcom.sun.management.jmxremote.rmi.port=1616
-Dcom.sun.management.jmxremote.ssl=false
-Dcom.sun.management.jmxremote.authenticate=false"
+ - name: ACTIVEMQ_BROKER_NAME
+ value: "activemq-broker"
+ - name: ACTIVEMQ_OPTS
+ value: "-Xmx128m -Xms128m"
+ resources:
+ limits:
+ cpu: 100m
+ memory: "256Mi"
+ requests:
+ cpu: 100m
+ memory: "128Mi"
+ volumeMounts:
+ - name: activemq-config
+ mountPath: /opt/activemq/conf/activemq.xml
+ subPath: activemq
+ {{- if .Values.features.activemqMonitor.enabled }}
+ - name: activemq-exporter
+ image: bitnami/jmx-exporter:0.20.0
+ imagePullPolicy: IfNotPresent
+ ports:
+ - containerPort: 5556
+ name: metrics
+ resources:
+ limits:
+ cpu: 100m
+ memory: "256Mi"
+ requests:
+ cpu: 100m
+ memory: "128Mi"
+ volumeMounts:
+ - name: activemq-config
+ mountPath:
/opt/bitnami/jmx-exporter/example_configs/httpserver_sample_config.yml
+ subPath: config
+ {{- end }}
+ volumes:
+ - name: activemq-config
+ configMap:
+ name: activemq-config
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: activemq
+ namespace: {{ .Values.ciliumServices.namespace }}
+spec:
+ selector:
+ app: activemq
+ ports:
+ - protocol: TCP
+ port: 61616
+ targetPort: 61616
+
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: rating-deployment
+ namespace: {{ .Values.ciliumServices.namespace }}
+ labels:
+ app: rating
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: rating
+ template:
+ metadata:
+ labels:
+ app: rating
+ spec:
+ containers:
+ - name: rating
+ image: "{{ .Values.ciliumServices.hub }}/rating-service:{{
.Values.ciliumServices.tag }}"
+ imagePullPolicy: IfNotPresent
+ ports:
+ - containerPort: 80
+ env:
+ - name: SW_AGENT_NAME
+ value: agent::rating
+ - name: SW_AGENT_REPORTER_GRPC_BACKEND_SERVICE
+ value: {{ template "skywalking.collector.address" . }}
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: rating
+ namespace: {{ .Values.ciliumServices.namespace }}
+spec:
+ selector:
+ app: rating
+ ports:
+ - protocol: TCP
+ port: 80
+ targetPort: 80
+
+
+{{- end }}
diff --git a/deploy/platform/kubernetes/values.yaml
b/deploy/platform/kubernetes/values.yaml
index 0b19cc4..865a49b 100644
--- a/deploy/platform/kubernetes/values.yaml
+++ b/deploy/platform/kubernetes/values.yaml
@@ -91,6 +91,20 @@ skywalking:
</Root>
</Loggers>
</Configuration>
+ cilium-rules:
+ exclude.yaml: |
+ namespaces:
+ - kube-system
+ - skywalking-showcase
+ - sample-services
+
+ labels:
+ - k8s:io.cilium.k8s.namespace.labels.istio-injection: enabled
+ k8s:security.istio.io/tlsMode: istio
+
+ metadata-service-mapping.yaml: |
+ serviceName:
cilium::${LABELS."app.kubernetes.io/name",LABELS.component,LABELS.app,LABELS.k8s-app}.${NAMESPACE}
+ serviceInstanceName: ${NAME}
ui:
name: ui
replicas: 1
@@ -214,6 +228,11 @@ sampleServices:
tag: ~
namespace: sample-services
+ciliumServices:
+ hub: ~
+ tag: ~
+ namespace: cilium-services
+
# @feature: java-agent-injector; the java agent injector is a component of the
swck operator, so we need to deploy the swck operator firstly
swck:
image:
diff --git a/docs/readme.md b/docs/readme.md
index d82dbc6..2b611a3 100644
--- a/docs/readme.md
+++ b/docs/readme.md
@@ -115,6 +115,7 @@ Currently, the features supported are:
| `pulsar-monitor` | Deploy OpenTelemetry and export Pulsar monitoring
metrics to SkyWalking for analysis and display on UI.
|
|
| `rabbitmq-monitor` | Deploy OpenTelemetry and export RabbitMQ
monitoring metrics to SkyWalking for analysis and display on UI.
|
|
| `activemq-monitor` | Deploy OpenTelemetry and export [ActiveMQ
classic](https://activemq.apache.org/components/classic/) monitoring metrics to
SkyWalking for analysis and display on UI. |
|
+| `cilium` | Deploy Cilium and showcase services in a separate
namespace, SkyWalking fetch Cilium Services Traffic to analysis and display on
UI. | Only support deployment
in the Kubernetes environment, docker is not supported.
|
### Kubernetes
