diff --git a/Makefile b/Makefile index c72a4d9..91bdaf3 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ repo ?= ghcr.io/jd-opensource -version:=1.0.0-$(shell git rev-parse --short HEAD)-$(shell date +%Y%m%d%H%M%S) +version:=1.2.0-$(shell git rev-parse --short HEAD) ifeq (,$(shell go env GOBIN)) GOBIN=$(shell go env GOPATH)/bin diff --git a/deploy/joylive-injector/Chart.yaml b/deploy/joylive-injector/Chart.yaml index 9bbc0c4..ccddbed 100644 --- a/deploy/joylive-injector/Chart.yaml +++ b/deploy/joylive-injector/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.1.0 +version: 1.2.0 keywords: - joylive @@ -26,4 +26,4 @@ home: https://github.com/jd-opensource/joylive-injector # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.1.0" +appVersion: "1.2.0" diff --git a/deploy/joylive-injector/README-zh.md b/deploy/joylive-injector/README-zh.md new file mode 100644 index 0000000..7c7ca00 --- /dev/null +++ b/deploy/joylive-injector/README-zh.md @@ -0,0 +1,25 @@ +# joylive-injector + +[![GitHub repo](https://img.shields.io/badge/GitHub-repo-blue)](https://github.com/jd-opensource/joylive-injector) +[![GitHub release](https://img.shields.io/github/release/jd-opensource/joylive-injector.svg)](https://github.com/jd-opensource/joylive-injector/releases) +[![Slack Status](https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social)](https://joylivehq.slack.com) + +[English](./README.md) | 简体中文 + +## 介绍 +这是一个针对kubernetes的动态准入控制webhook,它可以用于修改`kubernete`资源。 +此程序监视`deployments`的CREATE、UPDATE、DELETE事件和`pods`的CREATE事件,并为`POD`添加initContainer、默认增加环境变量`JAVA_TOOL_OPTIONS`、挂载configmap、修改主容器的卷装载等操作。 + +## 特性 +- 支持自动将`joylive-agent`注入Java应用的Pod。 +- 支持多版本`joylive-agent`与对应配置管理。 +- 支持注入指定版本`joylive-agent`及对应配置。 + +## 使用方式 + +因证书签名已按照命名空间为`joylive`预生成,所以须指定安装到对应命名空间。 执行命令: +```bash +helm repo add joylive https://jd-opensource.github.io/joylive-helm-charts +kubectl create namespace joylive +helm install joylive-injector joylive/joylive-injector -n joylive +``` diff --git a/deploy/joylive-injector/README.md b/deploy/joylive-injector/README.md new file mode 100644 index 0000000..a7e5ecc --- /dev/null +++ b/deploy/joylive-injector/README.md @@ -0,0 +1,24 @@ +# joylive-injector + +[![GitHub repo](https://img.shields.io/badge/GitHub-repo-blue)](https://github.com/jd-opensource/joylive-injector) +[![GitHub release](https://img.shields.io/github/release/jd-opensource/joylive-injector.svg)](https://github.com/jd-opensource/joylive-injector/releases) +[![Slack Status](https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social)](https://joylivehq.slack.com) + +English | [简体中文](./README-zh.md) + +## Description +This is a dynamic admission control webhook for kubernetes, it can be used to mutate kubernetes resources. +This program monitors the `CREATE`, `UPDATE`, `DELETE` events for `deployments` and the `CREATE` events for `pods` and adds the initContainer for `Pod` , adds the environment variable `JAVA_TOOL_OPTIONS` by default, mounts the configmap, modifies the volume load for the main container, and so on. + +## Features +- Supports automatically injecting `joylive-agent` into Pods of Java applications. +- Supports multi-version `joylive-agent` and corresponding configuration management. +- Support injection of specified version `joylive-agent` and corresponding configuration. + +## Used +Since the certificate signature has been pre-generated according to the namespace `joylive`, it is necessary to specify installation to the corresponding namespace. Execute the command: +```bash +helm repo add joylive https://jd-opensource.github.io/joylive-helm-charts +kubectl create namespace joylive +helm install joylive-injector joylive/joylive-injector -n joylive +``` diff --git a/deploy/packages/joylive-injector-1.2.0.tgz b/deploy/packages/joylive-injector-1.2.0.tgz new file mode 100644 index 0000000..6176267 Binary files /dev/null and b/deploy/packages/joylive-injector-1.2.0.tgz differ