* Update changed.md. (#73)

* Update image tags of adapter and operator.

Signed-off-by: Ye Cao <[email protected]>

CHANGES.md

@@ -6,16 +6,22 @@ Release Notes.
 ------------------
 
 #### Features
+- Replace go-bindata with embed lib.
 - Add the OAPServerConfig CRD, webhooks and controller.
 - Add the OAPServerDynamicConfig CRD, webhooks and controller.
+- Add the SwAgent CRD, webhooks and controller.
+- [Breaking Change] Remove the way to configure the agent through Configmap.
 
 #### Bugs
-- Fixed the error in e2e testing.
-- Fixed status inconsistent with CI.
+- Fix the error in e2e testing.
+- Fix status inconsistent with CI.
+- Bump up prometheus client version to fix cve.
 
 #### Chores
+- Bump several dependencies of adapter.
+- Update license eye version.
 - Bump up SkyWalking OAP to 9.0.0.
-- Bump up the k8s api of the e2e environment to v1.21.10
+- Bump up the k8s api of the e2e environment to v1.21.10.
 
 0.6.1
 ------------------

adapter/config/namespaced/adapter/kustomization.yaml

@@ -22,4 +22,4 @@ kind: Kustomization
 images:
 - name: metrics-adapter
  newName: apache/skywalking-swck
- newTag: v0.6.1
+ newTag: v0.7.0

docs/java-agent-injector.md

@@ -127,21 +127,23 @@ SwAgent CRD basic structure is like:
 apiVersion: operator.skywalking.apache.org/v1alpha1
 kind: SwAgent
 metadata:
- name: swagent
- namespace: skywalking-system
+ name: swagent-demo
+ namespace: default
 spec:
  containerMatcher: ''
  selector:
- app: demo
  javaSidecar:
- name: swagent
- image: apache/skywalking-java-agent:8.8.0-java8
+ name: swagent-demo
+ image: apache/skywalking-java-agent:8.10.0-java8
  env:
- - name: SW_LOGGING_LEVEL
+ - name: "SW_LOGGING_LEVEL"
  value: "DEBUG"
- sharedVolume:
- name: "sky-agent"
- mountPath: "/sky/agent"
+ - name: "SW_AGENT_COLLECTOR_BACKEND_SERVICES"
+ value: "skywalking-system-oap:11800"
+ sharedVolumeName: "sky-agent-demo"
+ optionalPlugins:
+ - "webflux"
+ - "cloud-gateway-2.1.x"
 ```
 
 There are three kind of configs in SwAgent CR.
@@ -165,10 +167,10 @@ injection configuration will affect on agent injection behaviour
 | javaSidecar | javaSidecar is the configs for init container, which holds agent sdk and take agent sdk to the target containers. | |
 | javaSidecar.name | the name of the init container. | inject-skywalking-agent |
 | javaSidecar.image | the image of the init container. | apache/skywalking-java-agent:8.8.0-java8 |
-| sharedVolume | shareVolume is the configs for shared volume between init container and target container. | |
-| sharedVolume.name | the name of the shared volume.     | sky-agent |
-| sharedVolume.mountPath | the mount path of the shared volume. | /sky/agent |
-
+| SharedVolumeName | SharedVolume is the name of an empty volume which shared by initContainer and target containers. | sky-agent |
+| SwConfigMapVolume | SwConfigMapVolume defines the configmap which contains agent.config | no default value | 
+| OptionalPlugins | Select the optional plugin which needs to be moved to the directory(/plugins). Such as `trace`,`webflux`,`cloud-gateway-2.1.x`. | no default value |
+| OptionalReporterPlugins | Select the optional reporter plugin which needs to be moved to the directory(/plugins). such as `kafka`. | no default value |
 
 #### 3. skywalking agent configuration
 

operator/apis/operator/v1alpha1/swagent_types.go

@@ -22,9 +22,6 @@ import (
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
-// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
-
 // SwAgentSpec defines the desired state of SwAgent
 type SwAgentSpec struct {
  // Selector is the selector label of injected Object
@@ -35,7 +32,7 @@ type SwAgentSpec struct {
  // +kubebuilder:validation:Optional
  ContainerMatcher string `json:"containerMatcher,omitempty"`
 
- // Java defines Java agent special configs.
+ // JavaSidecar defines Java agent special configs.
  // +kubebuilder:validation:Optional
  JavaSidecar JavaSidecar `json:"javaSidecar,omitempty"`
 

operator/config/manager/kustomization.yaml

@@ -30,4 +30,4 @@ kind: Kustomization
 images:
 - name: controller
  newName: apache/skywalking-swck
- newTag: v0.6.1
+ newTag: v0.7.0

operator/config/samples/operator_v1alpha1_swagent.yaml → operator/config/samples/swagent.yaml

@@ -20,4 +20,21 @@ kind: SwAgent
 metadata:
  name: swagent-sample
 spec:
- # TODO(user): Add fields here
+ containerMatcher: ''
+ selector:
+ javaSidecar:
+ name: swagent-sample
+ image: apache/skywalking-java-agent:8.8.0-java8
+ env:
+ - name: "SW_LOGGING_LEVEL"
+ value: "DEBUG"
+ - name: "SW_AGENT_COLLECTOR_BACKEND_SERVICES"
+ value: "skywalking-system-oap.skywalking-system.svc:11800"
+ sharedVolumeName: "sky-agent-test-001"
+ swConfigMapVolume:
+ name: "java-agent-configmap-test-001-volume"
+ configMapName: "java-agent-config"
+ configMapMountFile: "agent.config"
+ optionalPlugins:
+ - "webflux"
+ - "cloud-gateway-2.1.x"