This is an automated email from the ASF dual-hosted git repository.
kichan pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git
The following commit(s) were added to refs/heads/master by this push:
new 70e8e27 Documentation Updates (#216)
70e8e27 is described below
commit 70e8e27669a4072abc466fd3660aebbf3bb5e3a9
Author: Kit Chan <[email protected]>
AuthorDate: Sun May 5 00:13:31 2024 -0700
Documentation Updates (#216)
* Update README.md
* Update TUTORIAL.md
* Update TUTORIAL.md
* Update TUTORIAL.md
* Delete docs/images/datasource-success.png
* Delete docs/images/new-datasource.png
* Delete docs/images/new-graph.png
* Delete k8s/apps directory
* Delete k8s/configmaps directory
* Delete k8s/ingresses directory
* Delete k8s/prometheus directory
* Delete k8s/traffic-server directory
* Update .gitmodules
* Update .gitmodules
* Update TUTORIAL.md
---
README.md | 7 +-
docs/TUTORIAL.md | 150 ++++--------------------------
docs/images/datasource-success.png | Bin 103861 -> 0 bytes
docs/images/new-datasource.png | Bin 95425 -> 0 bytes
docs/images/new-graph.png | Bin 406834 -> 0 bytes
k8s/apps/app-deployment.yaml | 147 -----------------------------
k8s/apps/app-service.yaml | 89 ------------------
k8s/configmaps/ats-configmap.yaml | 35 -------
k8s/configmaps/fluentd-configmap.yaml | 49 ----------
k8s/configmaps/prometheus-configmap.yaml | 58 ------------
k8s/ingresses/ats-ingress-2.yaml | 50 ----------
k8s/ingresses/ats-ingress-2s.yaml | 43 ---------
k8s/ingresses/ats-ingress.yaml | 59 ------------
k8s/prometheus/ats-stats.yaml | 28 ------
k8s/prometheus/prometheus-deployment.yaml | 88 ------------------
k8s/traffic-server/ats-deployment.yaml | 135 ---------------------------
k8s/traffic-server/ats-ns.yaml | 20 ----
k8s/traffic-server/ats-rbac.yaml | 60 ------------
18 files changed, 22 insertions(+), 996 deletions(-)
diff --git a/README.md b/README.md
index 9275fd5..5a9d03c 100644
--- a/README.md
+++ b/README.md
@@ -19,8 +19,8 @@
ATS Kubernetes Ingress Controller
=================================
-
-
+
+
[](https://goreportcard.com/report/github.com/apache/trafficserver-ingress-controller)
@@ -31,7 +31,7 @@
Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con
-
[Tutorial](https://github.com/apache/trafficserver-ingress-controller/blob/master/docs/TUTORIAL.md)
-
[Development](https://github.com/apache/trafficserver-ingress-controller/blob/master/docs/DEVELOPMENT.md)
-## Versions of Software Used
+## Dependencies
- Alpine Linux 3.16.9
- Apache Traffic Server 9.2.4
- LuaJIT 2.0.4
@@ -39,4 +39,5 @@
Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con
- Other Packages
- luasocket 3.0.0
- redis-lua 2.0.4
+- Tested on Minikube 1.30.1 / Kubernetes 1.27.11
diff --git a/docs/TUTORIAL.md b/docs/TUTORIAL.md
index 4f51cee..32c1672 100644
--- a/docs/TUTORIAL.md
+++ b/docs/TUTORIAL.md
@@ -18,108 +18,25 @@
-->
## Tutorial
-- [Requirements](#requirements)
-- [Download project](#download-project)
-- [Example Walkthrough](#example-walkthrough)
- - [Setting Up Proxy](#setting-up-proxy)
- - [Setting Up Backend Applications](#setting-up-backend-applications)
- - [Checking Results](#checking-results)
+- [Usage](#usage)
- [ConfigMap](#configmap)
- [Namespaces for Ingresses](#namespaces-for-ingresses)
- [Snippet](#snippet)
- [Ingress Class](#ingress-class)
- [Customizing Logging and TLS](#customizing-logging-and-tls)
- [Customizing plugins](#customizing-plugins)
-- [Logging and Monitoring](#logging-and-monitoring)
- - [Fluentd](#fluentd)
- - [Prometheus and Grafana](#prometheus-and-grafana)
+ - [Enabling Controller Debug Log](#enabling-controller-debug-log)
+ - [Resync Period of Controller](#resync-period-of-controller)
+- [Integrating with Fluentd and
Prometheus](#integrating-with-fluentd-and-prometheus)
- [Helm Chart](#helm-chart)
-### Requirements
-- Docker
-- (Tested on) Kubernetes 1.24.12 (through Minikube 1.25.2)
+### Usage
-To install Docker, visit its [official page](https://docs.docker.com/) and
install the correct version for your system.
-
-The walkthrough uses Minikube to guide you through the setup process. Visit
the [official Minikube
page](https://kubernetes.io/docs/tasks/tools/install-minikube/) to install
Minikube.
-
-### Download project
-You can use `git clone` to download repository to your computer.
-
-### Example Walkthrough
-
-#### Setting Up Proxy
-
-Once you have cloned the project repo and started Docker and Minikube, in the
terminal:
-1. `$ eval $(minikube docker-env)`
-2. `$ cd trafficserver-ingress-controller`
-3. `$ git submodule update --init`
-4. `$ docker build -t ats-ingress .`
-5. `$ docker build -t ats-ingress-exporter k8s/images/trafficserver_exporter/`
-6. `$ docker build -t node-app-1 k8s/images/node-app-1/`
-7. `$ docker build -t node-app-2 k8s/images/node-app-2/`
-8. `$ docker pull fluent/fluentd:v1.14-debian-1`
-
-- At this point, we have created necessary images for our example:
- - Step 4 builds an image to create a Docker container that will contain the
Apache Traffic Server (ATS) itself, the kubernetes ingress controller, along
with other software required for the controller to do its job.
- - Step 5 builds an image for the trafficserver exporter. This exports the
ATS statistics for Prometheus to read. It uses the [Stats Over HTTP
Plugin](https://docs.trafficserver.apache.org/en/9.0.x/admin-guide/plugins/stats_over_http.en.html)
- - Steps 6 and 7 build 2 images that will serve as backends to [kubernetes
services](https://kubernetes.io/docs/concepts/services-networking/service/)
which we will shortly create
- - Step 8 builds an image for fluentd. This is for log collection.
-
-9. `$ kubectl apply -f k8s/traffic-server/ats-ns.yaml`
-10. `$ openssl req -x509 -sha256 -nodes -days 365 -newkey rsa:2048 -keyout
tls.key -out tls.crt -subj "/CN=atssvc/O=atssvc"`
-11. `$ kubectl create secret tls tls-secret --key tls.key --cert tls.crt -n
trafficserver-test --dry-run=client -o yaml | kubectl apply -f -`
-12. `$ kubectl apply -f k8s/configmaps/fluentd-configmap.yaml`
-13. `$ kubectl apply -f k8s/traffic-server/`
-
-- Now we have an ATS running inside the cluster.
- - Step 9 creates a namespace for ATS pod.
- - Steps 10 and 11 create a self-signed SSL certificate and keep it in a
secret inside the namespace above.
- - Step 12 provides the ConfigMap for configuration options for fluentd
- - Step 13 deploys a single ATS pod to said namespace. The ATS pod is also
where the ingress controller lives.
-
-#### Setting Up Backend Applications
-
-The following steps can be executed in any order
-
-- `$ kubectl apply -f k8s/apps/`
- - creates namespaces `trafficserver-test-2` and `trafficserver-test-3` if
not already exist
- - creates kubernetes services and
[deployments](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/)
for `appsvc1` and `appsvc2`
- - deploy 2 of each `appsvc1`, and `appsvc2` pods in `trafficserver-test-2`,
totally 4 pods in said namespace.
- - similarly, deploy 2 of each `appsvc1`, and `appsvc2` pods in
`trafficserver-test-3`, totally 4 pods in this namespace. We now have 8 pods in
total for the 2 services we have created and deployed in the 2 namespaces.
-
-- `$ kubectl apply -f k8s/ingresses/`
- - creates namespaces `trafficserver-test-2` and `trafficserver-test-3` if
not already exist
- - defines an ingress resource in both `trafficserver-test-2` and
`trafficserver-test-3`
- - the ingress resource in `trafficserver-test-2` defines domain name
`test.media.com` with `/app1` and `/app2` as its paths
- - both ingress resources define domain name `test.edge.com`; however,
`test.edge.com/app1` is only defined in `trafficserver-test-2` and
`test.edge.com/app2` is only defined in `trafficserver-test-3`
- - Addtionally, an ingress resources defines HTTPS access for
`test.edge.com/app2` in namespace `trafficserver-test-3`
-
-#### Checking Results
-
-ATS proxying should have started to work. To see proxy in action, we can use
[curl](https://linux.die.net/man/1/curl):
-
-1. `$ curl -vH "HOST:test.media.com" "$(minikube ip):30080/app1"`
-2. `$ curl -vH "HOST:test.media.com" "$(minikube ip):30080/app2"`
-3. `$ curl -vH "HOST:test.edge.com" "$(minikube ip):30080/app1"`
-4. `$ curl -vH "HOST:test.edge.com" "$(minikube ip):30080/app2"`
-5. `$ curl -vH "HOST:test.edge.com" -k "https://$(minikube ip):30443/app2"`
-
-You may have problem with minikube using docker driver as localhost (i.e.
127.0.0.1) will be used as the cluster ip. So you will need to forward the
traffic designated for the port to the ports of the ATS pods inside the cluster
before the above curl commands will work. Each command below needs to be run in
separate terminal.
-
-- `$ kubectl port-forward $(kubectl -n trafficserver-test get pods
-l=app="trafficserver-test" -o name) 30443:8443 -n trafficserver-test`
-- `$ kubectl port-forward $(kubectl -n trafficserver-test get pods
-l=app="trafficserver-test" -o name) 30080:8080 -n trafficserver-test`
+Check out the project's github action "Build and Integrate". It has an example
of building the docker image for the ingress controller. It also demonstrates
the usage of the ingress controller throught integration tests. A Kubernetes
cluster is setup with applications and ingress controller for them.
#### ConfigMap
-Below is an example of configuring Apache Traffic Server [_reloadable_
configurations](https://docs.trafficserver.apache.org/en/8.0.x/admin-guide/files/records.config.en.html#reloadable)
using [kubernetes
configmap](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/)
resource:
-
-- `$ kubectl apply -f k8s/configmaps/ats-configmap.yaml`
- - create a ConfigMap resource in `trafficserver-test` with the annotation
`"ats-configmap":"true"` if not already exist
- - configure 3 _reloadable_ ATS configurations:
- 1. `proxy.config.output.logfile.rolling_enabled: "1"`
- 2. `proxy.config.output.logfile.rolling_interval_sec: "3000"`
- 3. `proxy.config.restart.active_client_threshold: "0"`
+The above also shows example of configuring Apache Traffic Server
[_reloadable_
configurations](https://docs.trafficserver.apache.org/en/9.2.x/admin-guide/files/records.config.en.html#reloadable)
using [kubernetes
configmap](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/)
resource.
#### Namespaces for Ingresses
@@ -127,67 +44,36 @@ You can specifiy the list of namespaces to look for
ingress object by providing
#### Snippet
-You can attach [ATS lua
script](https://docs.trafficserver.apache.org/en/8.0.x/admin-guide/plugins/lua.en.html)
to an ingress object and ATS will execute it for requests matching the routing
rules defined in the ingress object. See an example in annotation section of
yaml file [here](../k8s/ingresses/ats-ingress-2.yaml)
+You can attach [ATS lua
script](https://docs.trafficserver.apache.org/en/9.2.x/admin-guide/plugins/lua.en.html)
to an ingress object and ATS will execute it for requests matching the routing
rules defined in the ingress object.
#### Ingress Class
-You can provide an environment variable called `INGRESS_CLASS` in the
deployment to specify the ingress class. See an example commented out
[here](../k8s/traffic-server/ats-deployment.yaml). Only ingress object with
parameter `ingressClassName` in `spec` section with value equal to the
environment variable value will be used by ATS for routing
+You can provide an environment variable called `INGRESS_CLASS` in the
deployment to specify the ingress class. The above contains an example
commented out in the deployment yaml file. Only ingress object with parameter
`ingressClassName` in `spec` section with value equal to the environment
variable value will be used by ATS for routing.
#### Customizing Logging and TLS
You can specify a different
-[logging.yaml](https://docs.trafficserver.apache.org/en/8.1.x/admin-guide/files/logging.yaml.en.html)
and
[ssl_server_name.yaml](https://docs.trafficserver.apache.org/en/8.1.x/admin-guide/files/ssl_server_name.yaml.en.html)
by providing environment variable `LOG_CONFIG_FNAME` and `SSL_SERVER_FNAME`
respsectively. See an example commented out
[here](../k8s/traffic-server/ats-deployment.yaml). The new contents of them can
be provided through a ConfigMap and loaded to a volume mounted for t [...]
+[logging.yaml](https://docs.trafficserver.apache.org/en/9.2.x/admin-guide/files/logging.yaml.en.html)
and
[sni.yaml](https://docs.trafficserver.apache.org/en/9.2.x/admin-guide/files/sni.yaml.en.html)
by providing environment variable `LOG_CONFIG_FNAME` and
`SSL_SERVERNAME_FNAME` respsectively. The new contents of them can be provided
through a ConfigMap and loaded to a volume mounted for the ATS container
(Example [here](https://kubernetes.io/docs/concepts/storage/volumes/#configmap)
). [...]
#### Customizing Plugins
-You can specify extra plugins for
[plugin.config](https://docs.trafficserver.apache.org/en/8.1.x/admin-guide/files/plugin.config.en.html)
by providing environment variable `EXTRA_PLUGIN_FNAME`. Its contents can be
provided through a ConfigMap and loaded to a volume mounted for the ATS
container (Example
[here](https://kubernetes.io/docs/concepts/storage/volumes/#configmap) ).
+You can specify extra plugins for
[plugin.config](https://docs.trafficserver.apache.org/en/9.2.x/admin-guide/files/plugin.config.en.html)
by providing environment variable `EXTRA_PLUGIN_FNAME`. Its contents can be
provided through a ConfigMap and loaded to a volume mounted for the ATS
container (Example
[here](https://kubernetes.io/docs/concepts/storage/volumes/#configmap) ).
#### Enabling Controller Debug Log
-You can enable debug for the controller by providing environment variable
`INGRESS_DEBUG`. See an example commented out
[here](../k8s/traffic-server/ats-deployment.yaml).
+You can enable debug for the controller by providing environment variable
`INGRESS_DEBUG`.
-#### Tune Resync Period of Controller
+#### Resync Period of Controller
You can adjust the resync period for the controller by providing environment
variable `RESYNC_PRIOD`.
-### Logging and Monitoring
-
-#### Fluentd
+### Integrating with Fluentd and Prometheus
-The above tutorial is already integrated with
[Fluentd](https://docs.fluentd.org/). The configuration file used for the same
can be found [here](../k8s/configmaps/fluentd-configmap.yaml)
+[Fluentd](https://docs.fluentd.org/) can be used to capture the traffic server
access logs. [Prometheus](https://prometheus.io/) can be used to capture
metrics. Please checkout the below projects for examples.
-As can be seen from the default configuration file, Fluentd reads the Apache
Traffic Server access logs located at
-`/opt/ats/var/log/trafficserver/squid.log` and outputs them to `stdout`. Use
`kubectl logs` to check the logs
-
-- `kubectl logs $(kubectl -n trafficserver-test get pods
-l=app="trafficserver-test" -o name) -n trafficserver-test -c log-collector`
-
-The ouput plugin for Fluentd can be changed to send the logs to any desired
location supported by Fluentd including Elasticsearch, Kafka, MongoDB etc. You
can read more about output plugins [here](https://docs.fluentd.org/output).
-
-#### Prometheus and Grafana
-
-Use the following steps to install
[Prometheus](https://prometheus.io/docs/prometheus/latest/getting_started/) and
[Grafana](https://grafana.com/docs/grafana/latest/) and use them to monitor the
Apache Traffic Server statistics.
-
-1. `$ kubectl apply -f k8s/prometheus/ats-stats.yaml`
- - Creates a new service which connects to the ATS pod on port 9122. This
service will be used by Prometheus to read the Apache Traffic Server stats.
-2. `$ kubectl apply -f k8s/configmaps/prometheus-configmap.yaml`
- - Creates a new configmap which holds the configuration file for Prometheus.
You can modify this configuration file to suit your needs. More about that can
be read
[here](https://prometheus.io/docs/prometheus/latest/configuration/configuration/)
-3. `$ kubectl apply -f k8s/prometheus/prometheus-deployment.yaml`
- - Creates a new deployment consisting of Prometheus and Grafana. Also
creates two new services to access prometheus and grafana.
-4. Open `x.x.x.x:30090` in your web browser to access Prometheus where
`x.x.x.x` is the IP returned by the command: `$ minikube ip`
-5. Open `x.x.x.x:30030` in your web browser to access the Grafana dashboard
where `x.x.x.x` is the IP returned by the command: `$ minikube ip`.
-6. The default credentials for logging into Grafana are `admin:admin`
-7. Click on `Add your first data source' and select Prometheus under the 'Time
series databases category'
-8. Set an appropriate name for the data source and enter `localhost:9090` as
the URL
- 
-9. Click on 'Save & Test'. If everything has been installed correctly you
should get a notification saying 'Data source is working'
- 
-10. Click on the '+' icon in the left handside column and select 'Dashboard'
-11. Click on '+ Add new panel'
-12. Enter a PromQL query. For example if you want to add a graph showing the
total number of responses over time enter `trafficserver_responses_total` and
press Shift + Enter.
- 
-13. Click on Apply to add the graph to your dashboard. You can similarly make
add more graphs to your dashboard to suit your needs. To learn more about
Grafana click [here](https://grafana.com/docs/grafana/latest/)
+* https://github.com/gdvalle/trafficserver_exporter
+* https://github.com/buraksarp/apache-traffic-server-exporter
### Helm Chart
-Helm Chart is provided. You can delete the namespace of `trafficserver-test`
and `monitoring-layer` created above and continue the tutorial by following
instructions [here](../charts/ats-ingress/README.md). The curl commands
[here](#checking-results) will continue to work.
-
+Helm Chart is provided [here](../charts/ats-ingress/README.md).
diff --git a/docs/images/datasource-success.png
b/docs/images/datasource-success.png
deleted file mode 100644
index c1eac7d..0000000
Binary files a/docs/images/datasource-success.png and /dev/null differ
diff --git a/docs/images/new-datasource.png b/docs/images/new-datasource.png
deleted file mode 100644
index 1bfa7ae..0000000
Binary files a/docs/images/new-datasource.png and /dev/null differ
diff --git a/docs/images/new-graph.png b/docs/images/new-graph.png
deleted file mode 100644
index b12a335..0000000
Binary files a/docs/images/new-graph.png and /dev/null differ
diff --git a/k8s/apps/app-deployment.yaml b/k8s/apps/app-deployment.yaml
deleted file mode 100644
index 79ff78d..0000000
--- a/k8s/apps/app-deployment.yaml
+++ /dev/null
@@ -1,147 +0,0 @@
-# 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.
-
-apiVersion: v1
-kind: Namespace
-metadata:
- name: trafficserver-test-2
-
----
-
-apiVersion: v1
-kind: Namespace
-metadata:
- name: trafficserver-test-3
-
----
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: app1
- namespace: trafficserver-test-2
-spec:
- replicas: 2
- selector:
- matchLabels:
- app: app1
- template:
- metadata:
- labels:
- app: app1
- spec:
- containers:
- - name: app1
- image: node-app-1:latest
- imagePullPolicy: Never
- env:
- - name: AUTHOR
- value: app1
- ports:
- - containerPort: 8080
- resources:
- limits:
- memory: '150Mi'
- cpu: 50m
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: app2
- namespace: trafficserver-test-2
-spec:
- replicas: 2
- selector:
- matchLabels:
- app: app2
- template:
- metadata:
- labels:
- app: app2
- spec:
- containers:
- - name: app2
- image: node-app-2:latest
- imagePullPolicy: Never
- env:
- - name: AUTHOR
- value: app2
- ports:
- - containerPort: 8080
- resources:
- limits:
- memory: '150Mi'
- cpu: 50m
-
----
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: app1
- namespace: trafficserver-test-3
-spec:
- replicas: 2
- selector:
- matchLabels:
- app: app1
- template:
- metadata:
- labels:
- app: app1
- spec:
- containers:
- - name: app1
- image: node-app-1:latest
- imagePullPolicy: Never
- env:
- - name: AUTHOR
- value: app1
- ports:
- - containerPort: 8080
- resources:
- limits:
- memory: '150Mi'
- cpu: 50m
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: app2
- namespace: trafficserver-test-3
-spec:
- replicas: 2
- selector:
- matchLabels:
- app: app2
- template:
- metadata:
- labels:
- app: app2
- spec:
- containers:
- - name: app2
- image: node-app-2:latest
- imagePullPolicy: Never
- env:
- - name: AUTHOR
- value: app2
- ports:
- - containerPort: 8080
- resources:
- limits:
- memory: '150Mi'
- cpu: 50m
diff --git a/k8s/apps/app-service.yaml b/k8s/apps/app-service.yaml
deleted file mode 100644
index 260c8cf..0000000
--- a/k8s/apps/app-service.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.
-
-apiVersion: v1
-kind: Namespace
-metadata:
- name: trafficserver-test-2
-
----
-
-apiVersion: v1
-kind: Namespace
-metadata:
- name: trafficserver-test-3
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
- name: appsvc1
- namespace: trafficserver-test-2
-spec:
- ports:
- - port: 8080
- protocol: TCP
- targetPort: 8080
- selector:
- app: app1
----
-apiVersion: v1
-kind: Service
-metadata:
- name: appsvc2
- namespace: trafficserver-test-2
-spec:
- ports:
- - port: 8080
- name: "main"
- protocol: TCP
- targetPort: 8080
-
- selector:
- app: app2
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
- name: appsvc1
- namespace: trafficserver-test-3
-spec:
- ports:
- - port: 8080
- protocol: TCP
- targetPort: 8080
- selector:
- app: app1
----
-apiVersion: v1
-kind: Service
-metadata:
- name: appsvc2
- namespace: trafficserver-test-3
-spec:
- ports:
- - port: 8080
- name: "main"
- protocol: TCP
- targetPort: 8080
-
- selector:
- app: app2
-
-
diff --git a/k8s/configmaps/ats-configmap.yaml
b/k8s/configmaps/ats-configmap.yaml
deleted file mode 100644
index 79078ff..0000000
--- a/k8s/configmaps/ats-configmap.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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.
-
-apiVersion: v1
-kind: Namespace
-metadata:
- name: trafficserver-test
-
----
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- namespace: trafficserver-test
- name: ats
- annotations:
- "ats-configmap" : "true"
-data:
- # reloadable data only
- proxy.config.output.logfile.rolling_enabled: "1"
- proxy.config.output.logfile.rolling_interval_sec: "3000"
- proxy.config.restart.active_client_threshold: "0"
diff --git a/k8s/configmaps/fluentd-configmap.yaml
b/k8s/configmaps/fluentd-configmap.yaml
deleted file mode 100644
index e83b100..0000000
--- a/k8s/configmaps/fluentd-configmap.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: fluentd-config
- namespace: trafficserver-test
-data:
- fluent.conf: |
- <source>
- @type tail
- path /var/log/trafficserver/squid.log
- pos_file /var/log/trafficserver/squid.log.pos
- <parse>
- @type regexp
- expression ^(?<timestamp>[^ ]*)\s(?<processing_time>[^
]*)\s(?<client_ip>[^ ]*)\s(?<cache_result>[^ ]*)\s(?<response_length>[^
]*)\s(?<request_method>[^ ]*)\s(?<url>[^
]*)\s(?<username_authenticated_client>[^ ]*)\s(?<heirarchy_route>[^
]*)\s(?<content_type>[^ ]*)$
- </parse>
- tag trafficserver.access
- </source>
-
- <source>
- @type tail
- path /var/log/ingress/ingress_ats.err
- pos_file /var/log/ingress/ingress_ats.err.pos
- <parse>
- @type regexp
- expression ^(?<date>[^ ]*)\s(?<timestamp>[^ ]*)\s(?<log>.*)$
- </parse>
- tag ingress.log
- </source>
-
- <match **>
- @type stdout
- </match>
-
diff --git a/k8s/configmaps/prometheus-configmap.yaml
b/k8s/configmaps/prometheus-configmap.yaml
deleted file mode 100644
index 8fdcdc4..0000000
--- a/k8s/configmaps/prometheus-configmap.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.
-
-apiVersion: v1
-kind: Namespace
-metadata:
- name: monitoring-layer
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: prometheus-config
- namespace: monitoring-layer
-data:
- prometheus.yml: |
- # my global config
- global:
- scrape_interval: 15s # Set the scrape interval to every 15 seconds.
Default is every 1 minute.
- evaluation_interval: 15s # Evaluate rules every 15 seconds. The default
is every 1 minute.
- # scrape_timeout is set to the global default (10s).
-
- # Alertmanager configuration
- alerting:
- alertmanagers:
- - static_configs:
- - targets:
- # - alertmanager:9093
-
- # Load rules once and periodically evaluate them according to the global
'evaluation_interval'.
- rule_files:
- # - "first_rules.yml"
- # - "second_rules.yml"
-
- # A scrape configuration containing exactly one endpoint to scrape:
- # Here it's Prometheus itself.
- scrape_configs:
- # The job name is added as a label `job=<job_name>` to any timeseries
scraped from this config.
- - job_name: 'prometheus'
-
- # metrics_path defaults to '/metrics'
- # scheme defaults to 'http'.
-
- static_configs:
- - targets: ['ats-stats-exporter.trafficserver-test']
-
diff --git a/k8s/ingresses/ats-ingress-2.yaml b/k8s/ingresses/ats-ingress-2.yaml
deleted file mode 100644
index 43fbdde..0000000
--- a/k8s/ingresses/ats-ingress-2.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.
-
-apiVersion: v1
-kind: Namespace
-metadata:
- name: trafficserver-test-3
-
----
-
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
- name: app-ingress
- namespace: trafficserver-test-3
- annotations:
- ats.ingress.kubernetes.io/server-snippet: |
- ts.debug('Debug msg example')
- ts.error('Error msg example')
- -- ts.hook(TS_LUA_HOOK_SEND_RESPONSE_HDR, function()
- -- ts.client_response.header['Location'] = 'https://test.edge.com/app2'
- -- end)
- -- ts.http.skip_remapping_set(0)
- -- ts.http.set_resp(301, 'Redirect')
- ts.debug('Uncomment the above lines to redirect http request to https')
-spec:
- rules:
- - host: test.edge.com
- http:
- paths:
- - path: /app2
- pathType: Exact
- backend:
- service:
- name: appsvc2
- port:
- number: 8080
diff --git a/k8s/ingresses/ats-ingress-2s.yaml
b/k8s/ingresses/ats-ingress-2s.yaml
deleted file mode 100644
index 108ddf1..0000000
--- a/k8s/ingresses/ats-ingress-2s.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.
-
-apiVersion: v1
-kind: Namespace
-metadata:
- name: trafficserver-test-3
-
----
-
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
- name: app-ingress-https
- namespace: trafficserver-test-3
-spec:
- tls:
- - hosts:
- - test.edge.com
- rules:
- - host: test.edge.com
- http:
- paths:
- - path: /app2
- pathType: Exact
- backend:
- service:
- name: appsvc2
- port:
- number: 8080
diff --git a/k8s/ingresses/ats-ingress.yaml b/k8s/ingresses/ats-ingress.yaml
deleted file mode 100644
index d91c4dc..0000000
--- a/k8s/ingresses/ats-ingress.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.
-
-apiVersion: v1
-kind: Namespace
-metadata:
- name: trafficserver-test-2
-
----
-
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
- name: app-ingress
- namespace: trafficserver-test-2
-spec:
- rules:
- - host: test.media.com
- http:
- paths:
- - path: /app1
- pathType: Exact
- backend:
- service:
- name: appsvc1
- port:
- number: 8080
- - path: /app2
- pathType: Exact
- backend:
- service:
- name: appsvc2
- port:
- number: 8080
-
- - host: test.edge.com
- http:
- paths:
- - path: /app1
- pathType: Exact
- backend:
- service:
- name: appsvc1
- port:
- number: 8080
-
diff --git a/k8s/prometheus/ats-stats.yaml b/k8s/prometheus/ats-stats.yaml
deleted file mode 100644
index 41869cd..0000000
--- a/k8s/prometheus/ats-stats.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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.
-
-apiVersion: v1
-kind: Service
-metadata:
- name: ats-stats-exporter
- namespace: trafficserver-test
-spec:
- type: ClusterIP
- ports:
- - port: 80
- targetPort: 9122
- selector:
- app: trafficserver-test
diff --git a/k8s/prometheus/prometheus-deployment.yaml
b/k8s/prometheus/prometheus-deployment.yaml
deleted file mode 100644
index 8788def..0000000
--- a/k8s/prometheus/prometheus-deployment.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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.
-
-apiVersion: v1
-kind: Namespace
-metadata:
- name: monitoring-layer
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: prometheus-deployment
- labels:
- app: prometheus
- namespace: monitoring-layer
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: prometheus-deployment
- template:
- metadata:
- labels:
- app: prometheus-deployment
- spec:
- containers:
- - name: prometheus-deployment
- image: prom/prometheus
- volumeMounts:
- - name: config-volume
- mountPath: /etc/prometheus/prometheus.yml
- subPath: prometheus.yml
- ports:
- - containerPort: 9090
- - name: grafana-deployment
- image: grafana/grafana
- ports:
- - containerPort: 3000
- volumes:
- - name: config-volume
- configMap:
- name: prometheus-config
----
-kind: Service
-apiVersion: v1
-metadata:
- name: prometheus-service
- namespace: monitoring-layer
-spec:
- type: NodePort
- selector:
- app: prometheus-deployment
- ports:
- - name: promui
- protocol: TCP
- port: 9090
- targetPort: 9090
- nodePort: 30090
----
-kind: Service
-apiVersion: v1
-metadata:
- name: grafana-service
- namespace: monitoring-layer
-spec:
- type: NodePort
- selector:
- app: prometheus-deployment
- ports:
- - name: grafui
- protocol: TCP
- port: 3000
- targetPort: 3000
- nodePort: 30030
-
diff --git a/k8s/traffic-server/ats-deployment.yaml
b/k8s/traffic-server/ats-deployment.yaml
deleted file mode 100644
index 3d67ef3..0000000
--- a/k8s/traffic-server/ats-deployment.yaml
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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.
-
-apiVersion: v1
-kind: Namespace
-metadata:
- name: trafficserver-test
-
----
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- labels:
- app: trafficserver-test
- name: trafficserver-test
- namespace: trafficserver-test
-spec:
- minReadySeconds: 30
-
- selector:
- matchLabels:
- app: trafficserver-test
-
- replicas: 1
-
- template:
- metadata:
- labels:
- app: trafficserver-test
- spec:
- containers:
- - name: trafficserver-test
- image: ats-ingress:latest # Needs to be updated
-# Optional privileged securityContext that can be handy when you need to do
debugging
-# securityContext:
-# privileged: true
- volumeMounts:
- - mountPath: "/etc/ats/ssl"
- name: ats-ssl
- readOnly: true
- - name: log-trafficserver
- mountPath: "/opt/ats/var/log/trafficserver"
- - name: log-ingress
- mountPath: "/opt/ats/var/log/ingress"
- imagePullPolicy: IfNotPresent
- env:
- - name: POD_NAME
- valueFrom:
- fieldRef:
- fieldPath: metadata.name
- - name: POD_NAMESPACE
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
-# Optional environment variables
-# - name: INGRESS_DEBUG
-# value: "true"
-# - name: INGRESS_CLASS
-# value: "ats"
-# - name: LOG_CONFIG_FNAME
-# value: "/opt/ats/etc/trafficserver/logging.yaml"
-# - name: SSL_SERVERNAME_FNAME
-# value: "/opt/ats/etc/trafficserver/ssl_server_name.yaml"
- - name: POD_TLS_PATH
- value: "/etc/ats/ssl"
- ports:
- - containerPort: 8080
- name: http
- protocol: TCP
- - containerPort: 8443
- name: https
- protocol: TCP
- - name: log-collector
- image: fluent/fluentd:v1.14-debian-1
- volumeMounts:
- - name: log-trafficserver
- mountPath: "/var/log/trafficserver"
- - name: log-ingress
- mountPath: "/var/log/ingress"
- - name: config-volume
- mountPath: "/fluentd/etc"
- - name: trafficserver-exporter
- image: ats-ingress-exporter:latest
- imagePullPolicy: IfNotPresent
- args: ["--endpoint=http://127.0.0.1:8080/_stats";]
- ports:
- - containerPort: 9122
- volumes:
- - name: ats-ssl
- secret:
- secretName: tls-secret
- - name: log-trafficserver
- emptyDir: {}
- - name: log-ingress
- emptyDir: {}
- - name: config-volume
- configMap:
- name: fluentd-config
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
- name: trafficserver-test
- namespace: trafficserver-test
-spec:
- type: NodePort
- ports:
- - name: http
- port: 8080
- protocol: TCP
- targetPort: 8080
- nodePort: 30080
- - name: https
- port: 8443
- protocol: TCP
- targetPort: 8443
- nodePort: 30443
- selector:
- app: trafficserver-test
diff --git a/k8s/traffic-server/ats-ns.yaml b/k8s/traffic-server/ats-ns.yaml
deleted file mode 100644
index eae88e4..0000000
--- a/k8s/traffic-server/ats-ns.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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.
-
-apiVersion: v1
-kind: Namespace
-metadata:
- name: trafficserver-test
diff --git a/k8s/traffic-server/ats-rbac.yaml b/k8s/traffic-server/ats-rbac.yaml
deleted file mode 100644
index f2c222e..0000000
--- a/k8s/traffic-server/ats-rbac.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.
-
-
-apiVersion: v1
-kind: Namespace
-metadata:
- name: trafficserver-test
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
- name: trafficserver-test
-rules:
-- apiGroups:
- - '*'
- resources:
- - ingresses
- - secrets
- - services
- - pods
- - namespaces
- - replicationcontrollers
- - endpoints
- - configmaps
- verbs:
- - get
- - list
- - watch
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
- name: trafficserver-test
-subjects:
-- kind: ServiceAccount
- name: default
- namespace: trafficserver-test
-roleRef:
- apiGroup: rbac.authorization.k8s.io
- kind: ClusterRole
- name: trafficserver-test
-
