Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chart/adapter/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
apiVersion: v2
name: skywalking-helm-swck-adapter
home: https://github.com/apache/skywalking-swck/tree/master/adapter
version: 0.9.0
version: 0.10.0
description: Provide custom metrics coming from SkyWalking OAP cluster for autoscaling by Kubernetes HPA
icon: https://raw.githubusercontent.com/apache/skywalking-kubernetes/master/logo/sw-logo-for-chart.jpg
sources:
Expand Down
2 changes: 1 addition & 1 deletion chart/adapter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ The following table lists the configurable parameters of the adapter chart and t
| `.serviceAccountName` | The service account name of adapter | `skywalking-custom-metrics-apiserver` |
| `.image.repository` | Adapter container image name | `docker.io/apache/skywalking-swck` |
| `.image.pullPolicy` | Adapter container image pull policy | `IfNotPresent` |
| `.image.tag` | Adapter container image tag | `v0.9.0` |
| `.image.tag` | Adapter container image tag | `0.10.0` |
| `.service.port` | The port for the adapter service | `6.1.0` |
| `.oap.service.name` | The service name of OAP | `skywalking-system-oap` |
| `.oap.service.namespace` | The service namespace of OAP | `skywalking-system` |
Expand Down
2 changes: 1 addition & 1 deletion chart/adapter/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ serviceAccountName: skywalking-custom-metrics-apiserver
image:
repository: docker.io/apache/skywalking-swck
pullPolicy: IfNotPresent
tag: "v0.9.0"
tag: "0.10.0"
service:
port: 6443
oap:
Expand Down
2 changes: 1 addition & 1 deletion chart/operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
apiVersion: v2
name: skywalking-helm-swck-operator
home: https://github.com/apache/skywalking-swck/tree/master/operator
version: 0.9.0
version: 0.10.0
description: Provision and maintain SkyWalking backend components
icon: https://raw.githubusercontent.com/apache/skywalking-kubernetes/master/logo/sw-logo-for-chart.jpg
sources:
Expand Down
2 changes: 1 addition & 1 deletion chart/operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ The following table lists the configurable parameters of the operator chart and
| `.serviceAccountName` | The service account name of operator | `skywalking-swck-controller-manager` |
| `.image.repository` | Operator container image name | `docker.io/apache/skywalking-swck` |
| `.image.pullPolicy` | Operator container image pull policy | `IfNotPresent` |
| `.image.tag` | Operator container image tag | `v0.9.0` |
| `.image.tag` | Operator container image tag | `0.10.0` |
| `.metrics.service.port` | The port for the operator metrics service | `8443` |
| `.webhook.service.port` | The port for the operator web hook service | `9443` |
| `.resources.limits.cpu` | The limits of cpu in the operator | `200m` |
Expand Down
664 changes: 514 additions & 150 deletions chart/operator/templates/crds.yaml

Large diffs are not rendered by default.

246 changes: 18 additions & 228 deletions chart/operator/templates/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,25 +74,8 @@ rules:
- ""
resources:
- configmaps
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- events
verbs:
- create
- patch
- apiGroups:
- ""
resources:
- persistentvolumeclaims
- secrets
- serviceaccounts
- services
verbs:
Expand All @@ -106,36 +89,16 @@ rules:
- apiGroups:
- ""
resources:
- pods
verbs:
- create
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- secrets
- serviceaccounts
- services
- events
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- serviceaccounts
- services
- pods
verbs:
- create
- delete
- get
- list
- patch
Expand All @@ -145,17 +108,6 @@ rules:
- apps
resources:
- deployments
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- apps
resources:
- statefulsets
verbs:
- create
Expand Down Expand Up @@ -205,179 +157,16 @@ rules:
- operator.skywalking.apache.org
resources:
- banyandbs
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- operator.skywalking.apache.org
resources:
- banyandbs/finalizers
verbs:
- update
- apiGroups:
- operator.skywalking.apache.org
resources:
- banyandbs/status
verbs:
- get
- patch
- update
- apiGroups:
- operator.skywalking.apache.org
resources:
- eventexporters
- fetchers
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- operator.skywalking.apache.org
resources:
- fetchers/status
verbs:
- get
- patch
- update
- apiGroups:
- operator.skywalking.apache.org
resources:
- javaagents
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- operator.skywalking.apache.org
resources:
- javaagents/status
verbs:
- delete
- get
- patch
- update
- apiGroups:
- operator.skywalking.apache.org
resources:
- oapserverconfigs
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- operator.skywalking.apache.org
resources:
- oapserverconfigs/status
verbs:
- get
- patch
- update
- apiGroups:
- operator.skywalking.apache.org
resources:
- oapserverdynamicconfigs
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- operator.skywalking.apache.org
resources:
- oapserverdynamicconfigs/status
verbs:
- get
- patch
- update
- apiGroups:
- operator.skywalking.apache.org
resources:
- oapservers
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- operator.skywalking.apache.org
resources:
- oapservers/status
verbs:
- get
- patch
- update
- apiGroups:
- operator.skywalking.apache.org
resources:
- satellites
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- operator.skywalking.apache.org
resources:
- satellites/finalizers
verbs:
- update
- apiGroups:
- operator.skywalking.apache.org
resources:
- satellites/status
verbs:
- get
- patch
- update
- apiGroups:
- operator.skywalking.apache.org
resources:
- storages
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- operator.skywalking.apache.org
resources:
- storages/status
verbs:
- get
- patch
- update
- apiGroups:
- operator.skywalking.apache.org
resources:
- swagents
- uis
verbs:
- create
- delete
Expand All @@ -389,35 +178,36 @@ rules:
- apiGroups:
- operator.skywalking.apache.org
resources:
- banyandbs/finalizers
- eventexporters/finalizers
- satellites/finalizers
- swagents/finalizers
verbs:
- update
- apiGroups:
- operator.skywalking.apache.org
resources:
- banyandbs/status
- eventexporters/status
- fetchers/status
- oapserverconfigs/status
- oapserverdynamicconfigs/status
- oapservers/status
- satellites/status
- storages/status
- swagents/status
- uis/status
verbs:
- get
- patch
- update
- apiGroups:
- operator.skywalking.apache.org
resources:
- uis
- javaagents/status
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- operator.skywalking.apache.org
resources:
- uis/status
verbs:
- get
- patch
- update
- apiGroups:
Expand Down
2 changes: 1 addition & 1 deletion chart/operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ serviceAccountName: skywalking-swck-controller-manager
image:
repository: docker.io/apache/skywalking-swck
pullPolicy: IfNotPresent
tag: "v0.9.0"
tag: "0.10.0"
securityContext:
allowPrivilegeEscalation: false
metrics:
Expand Down
11 changes: 5 additions & 6 deletions test/e2e/env
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@ OAP_REPO=ghcr.io/apache/skywalking/oap
# reproducible — bump this when a new horizon-ui feature/fix needs CI coverage.
UI_TAG=80565f563b6ea47c274141029d8ef6bd33b7eeac
UI_REPO=ghcr.io/apache/skywalking-horizon-ui
# SWCK operator dev image — published by apache/skywalking-swck's
# publish-docker.yml on every master push. Bump SWCK_OPERATOR_TAG when
# the SWCK PR with Horizon UI support gets merged & released; the chart's
# own default (apache/skywalking-swck:v0.9.0) stays unchanged for users.
SWCK_OPERATOR_REPO=ghcr.io/apache/skywalking-swck/operator
SWCK_OPERATOR_TAG=d299bc05ee230f5f366584054db5b099ca60166f
# SWCK operator release image — apache/skywalking-swck:0.10.0 includes
# Horizon UI support (PR #199). Match the chart default in
# chart/operator/values.yaml so CI exercises what users get.
SWCK_OPERATOR_REPO=docker.io/apache/skywalking-swck
SWCK_OPERATOR_TAG=0.10.0
SATELLITE_TAG=v35bfaff6352b4dc351a706772796a1f79b651c14
SATELLITE_REPO=ghcr.io/apache/skywalking-satellite/skywalking-satellite
BANYANDB_TAG=5dedaa1aa5106dd87ad9d6c5f08c63deefee5579
Expand Down
Loading
Loading