This is an automated email from the ASF dual-hosted git repository.
wu-sheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-helm.git
The following commit(s) were added to refs/heads/master by this push:
new 32f1811 Upgrade SWCK to 0.10.0 and Horizon UI examples to
horizon-0.6.0 (#189)
32f1811 is described below
commit 32f1811529456f852dc8942bb5fb28fbc8b9ac9c
Author: 吴晟 Wu Sheng <[email protected]>
AuthorDate: Mon Jun 8 23:13:15 2026 +0800
Upgrade SWCK to 0.10.0 and Horizon UI examples to horizon-0.6.0 (#189)
* Upgrade SWCK to 0.10.0
Bump chart/operator and chart/adapter to SWCK 0.10.0 (image tag now
drops the v prefix to match what was published to Docker Hub).
Refresh the operator CRDs from the v0.10.0 upstream, adding the new
EventExporter CRD, and regenerate the manager-role ClusterRole with
the matching permissions. Point CI at the released SWCK image and
bump SWCK reference URLs in the e2e tests.
* Use horizon-0.6.0 as the Horizon UI image tag example
apache/skywalking-ui:horizon-0.6.0 is the current published Horizon UI
release; horizon-1.0.0 was an aspirational example that does not yet
exist on Docker Hub.
* Bump pinned e2e SHAs for OAP, Horizon UI, BanyanDB
- OAP: a0cec0c -> 2aa0e85 (CVE dependency bumps)
- Horizon UI: 80565f5 -> 58a4c1f (post-v0.6.0, includes vitest CVE patch)
- BanyanDB: 5dedaa1 -> 65d951f (fodc agent retry fix)
---
README.md | 10 +-
chart/adapter/Chart.yaml | 2 +-
chart/adapter/README.md | 2 +-
chart/adapter/values.yaml | 2 +-
chart/operator/Chart.yaml | 2 +-
chart/operator/README.md | 2 +-
chart/operator/templates/crds.yaml | 664 ++++++++++++++++++------
chart/operator/templates/rbac.yaml | 246 +--------
chart/operator/values.yaml | 2 +-
chart/skywalking/README.md | 2 +-
chart/skywalking/values.yaml | 4 +-
test/e2e/env | 17 +-
test/e2e/swck/oap-agent-adapter-hpa.yaml | 4 +-
test/e2e/swck/oap-agent-banyandb.yaml | 2 +-
test/e2e/swck/oap-ui-agent-elasticsearch.yaml | 2 +-
test/e2e/swck/oap-ui-agent-oapserverconfig.yaml | 8 +-
test/e2e/swck/oap-ui-agent-satellite.yaml | 2 +-
17 files changed, 563 insertions(+), 410 deletions(-)
diff --git a/README.md b/README.md
index 7f051e8..011c576 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ There are required values that you must set explicitly when
deploying SkyWalking
| ---- | ----------- | ------- |
| `oap.image.tag` | the OAP docker image tag | `10.4.0` |
| `oap.storageType` | the storage type of the OAP | `elasticsearch`,
`postgresql`, `banyandb`, etc. |
-| `ui.image.tag` | the Horizon UI docker image tag | `horizon-1.0.0` |
+| `ui.image.tag` | the Horizon UI docker image tag | `horizon-0.6.0` |
You can set these required values via command line (e.g. `--set
oap.image.tag=10.4.0 --set oap.storageType=elasticsearch`),
or edit them in a separate file(e.g.
[`values.yaml`](chart/skywalking/values.yaml),
[`values-my-es.yaml`](chart/skywalking/values-my-es.yaml))
@@ -135,7 +135,7 @@ helm install "${SKYWALKING_RELEASE_NAME}" \
-n "${SKYWALKING_RELEASE_NAMESPACE}" \
--set oap.image.tag=10.4.0 \
--set oap.storageType=elasticsearch \
- --set ui.image.tag=horizon-1.0.0
+ --set ui.image.tag=horizon-0.6.0
```
To use BanyanDB as storage solution, you can try
@@ -147,7 +147,7 @@ helm install "${SKYWALKING_RELEASE_NAME}" \
-n "${SKYWALKING_RELEASE_NAMESPACE}" \
--set oap.image.tag=10.4.0 \
--set oap.storageType=banyandb \
- --set ui.image.tag=horizon-1.0.0 \
+ --set ui.image.tag=horizon-0.6.0 \
--set elasticsearch.enabled=false \
--set banyandb.enabled=true \
--set banyandb.image.tag=0.10.1
@@ -226,7 +226,7 @@ here are some examples.
helm install "${SKYWALKING_RELEASE_NAME}" ${REPO}/skywalking -n
"${SKYWALKING_RELEASE_NAMESPACE}" \
--set oap.image.tag=10.4.0 \
--set oap.storageType=elasticsearch \
- --set ui.image.tag=horizon-1.0.0 \
+ --set ui.image.tag=horizon-0.6.0 \
--set eck-operator.installCRDs=false
```
@@ -270,7 +270,7 @@ helm -n istio-system install skywalking \
-n "${SKYWALKING_RELEASE_NAMESPACE}" \
--set oap.image.tag=10.4.0 \
--set oap.storageType=elasticsearch \
- --set ui.image.tag=horizon-1.0.0
+ --set ui.image.tag=horizon-0.6.0
```
## Install development version using source codes
diff --git a/chart/adapter/Chart.yaml b/chart/adapter/Chart.yaml
index 87e9a2a..e098f4a 100644
--- a/chart/adapter/Chart.yaml
+++ b/chart/adapter/Chart.yaml
@@ -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:
diff --git a/chart/adapter/README.md b/chart/adapter/README.md
index 47245a0..da8647f 100644
--- a/chart/adapter/README.md
+++ b/chart/adapter/README.md
@@ -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` |
diff --git a/chart/adapter/values.yaml b/chart/adapter/values.yaml
index c76bf3b..37c2d45 100644
--- a/chart/adapter/values.yaml
+++ b/chart/adapter/values.yaml
@@ -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:
diff --git a/chart/operator/Chart.yaml b/chart/operator/Chart.yaml
index 6854690..cd9cc26 100644
--- a/chart/operator/Chart.yaml
+++ b/chart/operator/Chart.yaml
@@ -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:
diff --git a/chart/operator/README.md b/chart/operator/README.md
index d608575..0caf090 100644
--- a/chart/operator/README.md
+++ b/chart/operator/README.md
@@ -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` |
diff --git a/chart/operator/templates/crds.yaml
b/chart/operator/templates/crds.yaml
index 8431b64..2e3d3fe 100644
--- a/chart/operator/templates/crds.yaml
+++ b/chart/operator/templates/crds.yaml
@@ -18,7 +18,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.14.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: banyandbs.operator.skywalking.apache.org
spec:
group: operator.skywalking.apache.org
@@ -108,11 +108,13 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
+ x-kubernetes-list-type: atomic
matchFields:
description: A list of node selector
requirements
by node's fields.
@@ -140,11 +142,13 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
+ x-kubernetes-list-type: atomic
type: object
x-kubernetes-map-type: atomic
weight:
@@ -157,6 +161,7 @@ spec:
- weight
type: object
type: array
+ x-kubernetes-list-type: atomic
requiredDuringSchedulingIgnoredDuringExecution:
description: |-
If the affinity requirements specified by this field
are not met at
@@ -201,11 +206,13 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
+ x-kubernetes-list-type: atomic
matchFields:
description: A list of node selector
requirements
by node's fields.
@@ -233,14 +240,17 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
+ x-kubernetes-list-type: atomic
type: object
x-kubernetes-map-type: atomic
type: array
+ x-kubernetes-list-type: atomic
required:
- nodeSelectorTerms
type: object
@@ -301,11 +311,13 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
+ x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
@@ -320,13 +332,12 @@ spec:
description: |-
MatchLabelKeys is a set of pod label keys
to select which pods will
be taken into consideration. The keys are
used to lookup values from the
- incoming pod labels, those key-value
labels are merged with `LabelSelector` as `key in (value)`
+ incoming pod labels, those key-value
labels are merged with `labelSelector` as `key in (value)`
to select the group of existing pods which
pods will be taken into consideration
for the incoming pod's pod (anti)
affinity. Keys that don't exist in the incoming
pod labels will be ignored. The default
value is empty.
- The same key is forbidden to exist in both
MatchLabelKeys and LabelSelector.
- Also, MatchLabelKeys cannot be set when
LabelSelector isn't set.
- This is an alpha field and requires
enabling MatchLabelKeysInPodAffinity feature gate.
+ The same key is forbidden to exist in both
matchLabelKeys and labelSelector.
+ Also, matchLabelKeys cannot be set when
labelSelector isn't set.
items:
type: string
type: array
@@ -335,13 +346,12 @@ spec:
description: |-
MismatchLabelKeys is a set of pod label
keys to select which pods will
be taken into consideration. The keys are
used to lookup values from the
- incoming pod labels, those key-value
labels are merged with `LabelSelector` as `key notin (value)`
+ incoming pod labels, those key-value
labels are merged with `labelSelector` as `key notin (value)`
to select the group of existing pods which
pods will be taken into consideration
for the incoming pod's pod (anti)
affinity. Keys that don't exist in the incoming
pod labels will be ignored. The default
value is empty.
- The same key is forbidden to exist in both
MismatchLabelKeys and LabelSelector.
- Also, MismatchLabelKeys cannot be set when
LabelSelector isn't set.
- This is an alpha field and requires
enabling MatchLabelKeysInPodAffinity feature gate.
+ The same key is forbidden to exist in both
mismatchLabelKeys and labelSelector.
+ Also, mismatchLabelKeys cannot be set when
labelSelector isn't set.
items:
type: string
type: array
@@ -381,11 +391,13 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
+ x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
@@ -405,6 +417,7 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: atomic
topologyKey:
description: |-
This pod should be co-located (affinity)
or not co-located (anti-affinity) with the pods matching
@@ -427,6 +440,7 @@ spec:
- weight
type: object
type: array
+ x-kubernetes-list-type: atomic
requiredDuringSchedulingIgnoredDuringExecution:
description: |-
If the affinity requirements specified by this field
are not met at
@@ -476,11 +490,13 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
+ x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
@@ -495,13 +511,12 @@ spec:
description: |-
MatchLabelKeys is a set of pod label keys to
select which pods will
be taken into consideration. The keys are used
to lookup values from the
- incoming pod labels, those key-value labels
are merged with `LabelSelector` as `key in (value)`
+ incoming pod labels, those key-value labels
are merged with `labelSelector` as `key in (value)`
to select the group of existing pods which
pods will be taken into consideration
for the incoming pod's pod (anti) affinity.
Keys that don't exist in the incoming
pod labels will be ignored. The default value
is empty.
- The same key is forbidden to exist in both
MatchLabelKeys and LabelSelector.
- Also, MatchLabelKeys cannot be set when
LabelSelector isn't set.
- This is an alpha field and requires enabling
MatchLabelKeysInPodAffinity feature gate.
+ The same key is forbidden to exist in both
matchLabelKeys and labelSelector.
+ Also, matchLabelKeys cannot be set when
labelSelector isn't set.
items:
type: string
type: array
@@ -510,13 +525,12 @@ spec:
description: |-
MismatchLabelKeys is a set of pod label keys
to select which pods will
be taken into consideration. The keys are used
to lookup values from the
- incoming pod labels, those key-value labels
are merged with `LabelSelector` as `key notin (value)`
+ incoming pod labels, those key-value labels
are merged with `labelSelector` as `key notin (value)`
to select the group of existing pods which
pods will be taken into consideration
for the incoming pod's pod (anti) affinity.
Keys that don't exist in the incoming
pod labels will be ignored. The default value
is empty.
- The same key is forbidden to exist in both
MismatchLabelKeys and LabelSelector.
- Also, MismatchLabelKeys cannot be set when
LabelSelector isn't set.
- This is an alpha field and requires enabling
MatchLabelKeysInPodAffinity feature gate.
+ The same key is forbidden to exist in both
mismatchLabelKeys and labelSelector.
+ Also, mismatchLabelKeys cannot be set when
labelSelector isn't set.
items:
type: string
type: array
@@ -555,11 +569,13 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
+ x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
@@ -579,6 +595,7 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: atomic
topologyKey:
description: |-
This pod should be co-located (affinity) or
not co-located (anti-affinity) with the pods matching
@@ -591,6 +608,7 @@ spec:
- topologyKey
type: object
type: array
+ x-kubernetes-list-type: atomic
type: object
podAntiAffinity:
description: Describes pod anti-affinity scheduling rules
(e.g.
@@ -605,8 +623,8 @@ spec:
most preferred is the one with the greatest sum of
weights, i.e.
for each node that meets all of the scheduling
requirements (resource
request, requiredDuringScheduling anti-affinity
expressions, etc.),
- compute a sum by iterating through the elements of
this field and adding
- "weight" to the sum if the node has pods which
matches the corresponding podAffinityTerm; the
+ compute a sum by iterating through the elements of
this field and subtracting
+ "weight" from the sum if the node has pods which
matches the corresponding podAffinityTerm; the
node(s) with the highest sum are the most preferred.
items:
description: The weights of all of the matched
WeightedPodAffinityTerm
@@ -648,11 +666,13 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
+ x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
@@ -667,13 +687,12 @@ spec:
description: |-
MatchLabelKeys is a set of pod label keys
to select which pods will
be taken into consideration. The keys are
used to lookup values from the
- incoming pod labels, those key-value
labels are merged with `LabelSelector` as `key in (value)`
+ incoming pod labels, those key-value
labels are merged with `labelSelector` as `key in (value)`
to select the group of existing pods which
pods will be taken into consideration
for the incoming pod's pod (anti)
affinity. Keys that don't exist in the incoming
pod labels will be ignored. The default
value is empty.
- The same key is forbidden to exist in both
MatchLabelKeys and LabelSelector.
- Also, MatchLabelKeys cannot be set when
LabelSelector isn't set.
- This is an alpha field and requires
enabling MatchLabelKeysInPodAffinity feature gate.
+ The same key is forbidden to exist in both
matchLabelKeys and labelSelector.
+ Also, matchLabelKeys cannot be set when
labelSelector isn't set.
items:
type: string
type: array
@@ -682,13 +701,12 @@ spec:
description: |-
MismatchLabelKeys is a set of pod label
keys to select which pods will
be taken into consideration. The keys are
used to lookup values from the
- incoming pod labels, those key-value
labels are merged with `LabelSelector` as `key notin (value)`
+ incoming pod labels, those key-value
labels are merged with `labelSelector` as `key notin (value)`
to select the group of existing pods which
pods will be taken into consideration
for the incoming pod's pod (anti)
affinity. Keys that don't exist in the incoming
pod labels will be ignored. The default
value is empty.
- The same key is forbidden to exist in both
MismatchLabelKeys and LabelSelector.
- Also, MismatchLabelKeys cannot be set when
LabelSelector isn't set.
- This is an alpha field and requires
enabling MatchLabelKeysInPodAffinity feature gate.
+ The same key is forbidden to exist in both
mismatchLabelKeys and labelSelector.
+ Also, mismatchLabelKeys cannot be set when
labelSelector isn't set.
items:
type: string
type: array
@@ -728,11 +746,13 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
+ x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
@@ -752,6 +772,7 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: atomic
topologyKey:
description: |-
This pod should be co-located (affinity)
or not co-located (anti-affinity) with the pods matching
@@ -774,6 +795,7 @@ spec:
- weight
type: object
type: array
+ x-kubernetes-list-type: atomic
requiredDuringSchedulingIgnoredDuringExecution:
description: |-
If the anti-affinity requirements specified by this
field are not met at
@@ -823,11 +845,13 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
+ x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
@@ -842,13 +866,12 @@ spec:
description: |-
MatchLabelKeys is a set of pod label keys to
select which pods will
be taken into consideration. The keys are used
to lookup values from the
- incoming pod labels, those key-value labels
are merged with `LabelSelector` as `key in (value)`
+ incoming pod labels, those key-value labels
are merged with `labelSelector` as `key in (value)`
to select the group of existing pods which
pods will be taken into consideration
for the incoming pod's pod (anti) affinity.
Keys that don't exist in the incoming
pod labels will be ignored. The default value
is empty.
- The same key is forbidden to exist in both
MatchLabelKeys and LabelSelector.
- Also, MatchLabelKeys cannot be set when
LabelSelector isn't set.
- This is an alpha field and requires enabling
MatchLabelKeysInPodAffinity feature gate.
+ The same key is forbidden to exist in both
matchLabelKeys and labelSelector.
+ Also, matchLabelKeys cannot be set when
labelSelector isn't set.
items:
type: string
type: array
@@ -857,13 +880,12 @@ spec:
description: |-
MismatchLabelKeys is a set of pod label keys
to select which pods will
be taken into consideration. The keys are used
to lookup values from the
- incoming pod labels, those key-value labels
are merged with `LabelSelector` as `key notin (value)`
+ incoming pod labels, those key-value labels
are merged with `labelSelector` as `key notin (value)`
to select the group of existing pods which
pods will be taken into consideration
for the incoming pod's pod (anti) affinity.
Keys that don't exist in the incoming
pod labels will be ignored. The default value
is empty.
- The same key is forbidden to exist in both
MismatchLabelKeys and LabelSelector.
- Also, MismatchLabelKeys cannot be set when
LabelSelector isn't set.
- This is an alpha field and requires enabling
MatchLabelKeysInPodAffinity feature gate.
+ The same key is forbidden to exist in both
mismatchLabelKeys and labelSelector.
+ Also, mismatchLabelKeys cannot be set when
labelSelector isn't set.
items:
type: string
type: array
@@ -902,11 +924,13 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
+ x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
@@ -926,6 +950,7 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: atomic
topologyKey:
description: |-
This pod should be co-located (affinity) or
not co-located (anti-affinity) with the pods matching
@@ -938,6 +963,7 @@ spec:
- topologyKey
type: object
type: array
+ x-kubernetes-list-type: atomic
type: object
type: object
config:
@@ -1165,6 +1191,7 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: atomic
dataSource:
description: |-
dataSource field can be used to specify either:
@@ -1244,7 +1271,7 @@ spec:
resources:
description: |-
resources represents the minimum resources the
volume should have.
- If RecoverVolumeExpansionFailure feature is
enabled users are allowed to specify resource requirements
+ Users are allowed to specify resource requirements
that are lower than previous value but must still
be higher than capacity recorded in the
status field of the claim.
More info:
https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -1304,11 +1331,13 @@ spec:
items:
type: string
type: array
+ x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
+ x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
@@ -1329,15 +1358,13 @@ spec:
volumeAttributesClassName may be used to set the
VolumeAttributesClass used by this claim.
If specified, the CSI driver will create or update
the volume with the attributes defined
in the corresponding VolumeAttributesClass. This
has a different purpose than storageClassName,
- it can be changed after the claim is created. An
empty string value means that no VolumeAttributesClass
- will be applied to the claim but it's not allowed
to reset this field to empty string once it is set.
- If unspecified and the PersistentVolumeClaim is
unbound, the default VolumeAttributesClass
- will be set by the persistentvolume controller if
it exists.
+ it can be changed after the claim is created. An
empty string or nil value indicates that no
+ VolumeAttributesClass will be applied to the
claim. If the claim enters an Infeasible error state,
+ this field can be reset to its previous value
(including nil) to cancel the modification.
If the resource referred to by
volumeAttributesClass does not exist, this PersistentVolumeClaim will be
set to a Pending state, as reflected by the
modifyVolumeStatus field, until such as a resource
exists.
- More info:
https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass
- (Alpha) Using this field requires the
VolumeAttributesClass feature gate to be enabled.
+ More info:
https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
type: string
volumeMode:
description: |-
@@ -1410,20 +1437,131 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include
"operator.fullname" . }}-serving-cert
- controller-gen.kubebuilder.io/version: v0.14.0
+ controller-gen.kubebuilder.io/version: v0.19.0
+ name: eventexporters.operator.skywalking.apache.org
+spec:
+ group: operator.skywalking.apache.org
+ names:
+ kind: EventExporter
+ listKind: EventExporterList
+ plural: eventexporters
+ singular: eventexporter
+ scope: Namespaced
+ versions:
+ - additionalPrinterColumns:
+ - description: The version
+ jsonPath: .spec.version
+ name: Version
+ priority: 1
+ type: string
+ - jsonPath: .spec.image
+ name: Image
+ priority: 1
+ type: string
+ - description: The number of expected instances
+ jsonPath: .spec.instances
+ name: Instances
+ type: string
+ name: v1alpha1
+ schema:
+ openAPIV3Schema:
+ description: EventExporter is the Schema for the eventexporters API
+ properties:
+ apiVersion:
+ description: |-
+ APIVersion defines the versioned schema of this representation
of an object.
+ Servers should convert recognized schemas to the latest internal
value, and
+ may reject unrecognized values.
+ More info:
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+ type: string
+ kind:
+ description: |-
+ Kind is a string value representing the REST resource this
object represents.
+ Servers may infer this from the endpoint the client submits
requests to.
+ Cannot be updated.
+ In CamelCase.
+ More info:
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: EventExporterSpec defines the desired state of
EventExporter
+ properties:
+ config:
+ description: Config of filters and exporters
+ type: string
+ image:
+ description: Image is the event exporter Docker image to
deploy.
+ type: string
+ replicas:
+ description: Replicas is the number of event exporter pods
+ format: int32
+ type: integer
+ version:
+ description: Version of EventExporter.
+ type: string
+ required:
+ - replicas
+ - version
+ type: object
+ status:
+ description: EventExporterStatus defines the observed state of
EventExporter
+ properties:
+ availableReplicas:
+ description: Total number of available pods targeted by this
deployment.
+ format: int32
+ type: integer
+ conditions:
+ description: Represents the latest available observations of
the underlying
+ deployment's current state.
+ items:
+ description: DeploymentCondition describes the state of a
deployment
+ at a certain point.
+ properties:
+ lastTransitionTime:
+ description: Last time the condition transitioned from
one status
+ to another.
+ format: date-time
+ type: string
+ lastUpdateTime:
+ description: The last time this condition was updated.
+ format: date-time
+ type: string
+ message:
+ description: A human readable message indicating details
about
+ the transition.
+ type: string
+ reason:
+ description: The reason for the condition's last
transition.
+ type: string
+ status:
+ description: Status of the condition, one of True,
False, Unknown.
+ type: string
+ type:
+ description: Type of deployment condition.
+ type: string
+ required:
+ - status
+ - type
+ type: object
+ type: array
+ configMapName:
+ description: Name of the configMap.
+ type: string
+ type: object
+ type: object
+ served: true
+ storage: true
+ subresources:
+ status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+ annotations:
+ controller-gen.kubebuilder.io/version: v0.19.0
name: fetchers.operator.skywalking.apache.org
spec:
- conversion:
- strategy: Webhook
- webhook:
- clientConfig:
- service:
- name: skywalking-swck-webhook-service
- namespace: {{ .Release.Namespace }}
- path: /convert
- conversionReviewVersions:
- - v1
group: operator.skywalking.apache.org
names:
kind: Fetcher
@@ -1470,6 +1608,9 @@ spec:
a service
type: string
type: array
+ required:
+ - OAPServerAddress
+ - type
type: object
status:
description: FetcherStatus defines the observed state of Fetcher
@@ -1521,20 +1662,9 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include
"operator.fullname" . }}-serving-cert
- controller-gen.kubebuilder.io/version: v0.14.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: javaagents.operator.skywalking.apache.org
spec:
- conversion:
- strategy: Webhook
- webhook:
- clientConfig:
- service:
- name: skywalking-swck-webhook-service
- namespace: {{ .Release.Namespace }}
- path: /convert
- conversionReviewVersions:
- - v1
group: operator.skywalking.apache.org
names:
kind: JavaAgent
@@ -1597,6 +1727,9 @@ spec:
description: ServiceName is the name of service in the
injected agent,
which need to be printed
type: string
+ required:
+ - backendService
+ - serviceName
type: object
status:
description: JavaAgentStatus defines the observed state of
JavaAgent
@@ -1626,20 +1759,9 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include
"operator.fullname" . }}-serving-cert
- controller-gen.kubebuilder.io/version: v0.14.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: oapserverconfigs.operator.skywalking.apache.org
spec:
- conversion:
- strategy: Webhook
- webhook:
- clientConfig:
- service:
- name: skywalking-swck-webhook-service
- namespace: {{ .Release.Namespace }}
- path: /convert
- conversionReviewVersions:
- - v1
group: operator.skywalking.apache.org
names:
kind: OAPServerConfig
@@ -1694,7 +1816,9 @@ spec:
a Container.
properties:
name:
- description: Name of the environment variable. Must be a
C_IDENTIFIER.
+ description: |-
+ Name of the environment variable.
+ May consist of any printable ASCII characters except
'='.
type: string
value:
description: |-
@@ -1719,10 +1843,13 @@ spec:
description: The key to select.
type: string
name:
+ default: ""
description: |-
Name of the referent.
+ This field is effectively required, but due to
backwards compatibility is
+ allowed to be empty. Instances of this type
with an empty value here are
+ almost certainly wrong.
More info:
https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
kind, uid?
type: string
optional:
description: Specify whether the ConfigMap or
its key
@@ -1749,6 +1876,43 @@ spec:
- fieldPath
type: object
x-kubernetes-map-type: atomic
+ fileKeyRef:
+ description: |-
+ FileKeyRef selects a key of the env file.
+ Requires the EnvFiles feature gate to be enabled.
+ properties:
+ key:
+ description: |-
+ The key within the env file. An invalid key
will prevent the pod from starting.
+ The keys defined within a source may consist
of any printable ASCII characters except '='.
+ During Alpha stage of the EnvFiles feature
gate, the key size is limited to 128 characters.
+ type: string
+ optional:
+ default: false
+ description: |-
+ Specify whether the file or its key must be
defined. If the file or key
+ does not exist, then the env var is not
published.
+ If optional is set to true and the specified
key does not exist,
+ the environment variable will not be set in
the Pod's containers.
+
+ If optional is set to false and the specified
key does not exist,
+ an error will be returned during Pod creation.
+ type: boolean
+ path:
+ description: |-
+ The path within the volume from which to
select the file.
+ Must be relative and may not contain the '..'
path or start with '..'.
+ type: string
+ volumeName:
+ description: The name of the volume mount
containing
+ the env file.
+ type: string
+ required:
+ - key
+ - path
+ - volumeName
+ type: object
+ x-kubernetes-map-type: atomic
resourceFieldRef:
description: |-
Selects a resource of the container: only
resources limits and requests
@@ -1781,10 +1945,13 @@ spec:
be a valid secret key.
type: string
name:
+ default: ""
description: |-
Name of the referent.
+ This field is effectively required, but due to
backwards compatibility is
+ allowed to be empty. Instances of this type
with an empty value here are
+ almost certainly wrong.
More info:
https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
kind, uid?
type: string
optional:
description: Specify whether the Secret or its
key must
@@ -1821,6 +1988,8 @@ spec:
version:
description: Version of OAP.
type: string
+ required:
+ - version
type: object
status:
description: OAPServerConfigStatus defines the observed state of
OAPServerConfig
@@ -1850,7 +2019,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.14.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: oapserverdynamicconfigs.operator.skywalking.apache.org
spec:
group: operator.skywalking.apache.org
@@ -1917,6 +2086,8 @@ spec:
version:
description: Version of OAP.
type: string
+ required:
+ - version
type: object
status:
description: OAPServerDynamicConfigStatus defines the observed
state of
@@ -1944,20 +2115,9 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include
"operator.fullname" . }}-serving-cert
- controller-gen.kubebuilder.io/version: v0.14.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: oapservers.operator.skywalking.apache.org
spec:
- conversion:
- strategy: Webhook
- webhook:
- clientConfig:
- service:
- name: skywalking-swck-webhook-service
- namespace: {{ .Release.Namespace }}
- path: /convert
- conversionReviewVersions:
- - v1
group: operator.skywalking.apache.org
names:
kind: OAPServer
@@ -2020,7 +2180,9 @@ spec:
a Container.
properties:
name:
- description: Name of the environment variable. Must be a
C_IDENTIFIER.
+ description: |-
+ Name of the environment variable.
+ May consist of any printable ASCII characters except
'='.
type: string
value:
description: |-
@@ -2045,10 +2207,13 @@ spec:
description: The key to select.
type: string
name:
+ default: ""
description: |-
Name of the referent.
+ This field is effectively required, but due to
backwards compatibility is
+ allowed to be empty. Instances of this type
with an empty value here are
+ almost certainly wrong.
More info:
https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
kind, uid?
type: string
optional:
description: Specify whether the ConfigMap or
its key
@@ -2075,6 +2240,43 @@ spec:
- fieldPath
type: object
x-kubernetes-map-type: atomic
+ fileKeyRef:
+ description: |-
+ FileKeyRef selects a key of the env file.
+ Requires the EnvFiles feature gate to be enabled.
+ properties:
+ key:
+ description: |-
+ The key within the env file. An invalid key
will prevent the pod from starting.
+ The keys defined within a source may consist
of any printable ASCII characters except '='.
+ During Alpha stage of the EnvFiles feature
gate, the key size is limited to 128 characters.
+ type: string
+ optional:
+ default: false
+ description: |-
+ Specify whether the file or its key must be
defined. If the file or key
+ does not exist, then the env var is not
published.
+ If optional is set to true and the specified
key does not exist,
+ the environment variable will not be set in
the Pod's containers.
+
+ If optional is set to false and the specified
key does not exist,
+ an error will be returned during Pod creation.
+ type: boolean
+ path:
+ description: |-
+ The path within the volume from which to
select the file.
+ Must be relative and may not contain the '..'
path or start with '..'.
+ type: string
+ volumeName:
+ description: The name of the volume mount
containing
+ the env file.
+ type: string
+ required:
+ - key
+ - path
+ - volumeName
+ type: object
+ x-kubernetes-map-type: atomic
resourceFieldRef:
description: |-
Selects a resource of the container: only
resources limits and requests
@@ -2107,10 +2309,13 @@ spec:
be a valid secret key.
type: string
name:
+ default: ""
description: |-
Name of the referent.
+ This field is effectively required, but due to
backwards compatibility is
+ allowed to be empty. Instances of this type
with an empty value here are
+ almost certainly wrong.
More info:
https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
kind, uid?
type: string
optional:
description: Specify whether the Secret or its
key must
@@ -2265,8 +2470,9 @@ spec:
present in a Container.
properties:
name:
- description: Name of the environment
variable. Must
- be a C_IDENTIFIER.
+ description: |-
+ Name of the environment variable.
+ May consist of any printable ASCII
characters except '='.
type: string
value:
description: |-
@@ -2291,10 +2497,13 @@ spec:
description: The key to select.
type: string
name:
+ default: ""
description: |-
Name of the referent.
+ This field is effectively
required, but due to backwards compatibility is
+ allowed to be empty. Instances of
this type with an empty value here are
+ almost certainly wrong.
More info:
https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields.
apiVersion, kind, uid?
type: string
optional:
description: Specify whether the
ConfigMap
@@ -2321,6 +2530,43 @@ spec:
- fieldPath
type: object
x-kubernetes-map-type: atomic
+ fileKeyRef:
+ description: |-
+ FileKeyRef selects a key of the env
file.
+ Requires the EnvFiles feature gate to
be enabled.
+ properties:
+ key:
+ description: |-
+ The key within the env file. An
invalid key will prevent the pod from starting.
+ The keys defined within a source
may consist of any printable ASCII characters except '='.
+ During Alpha stage of the EnvFiles
feature gate, the key size is limited to 128 characters.
+ type: string
+ optional:
+ default: false
+ description: |-
+ Specify whether the file or its
key must be defined. If the file or key
+ does not exist, then the env var
is not published.
+ If optional is set to true and the
specified key does not exist,
+ the environment variable will not
be set in the Pod's containers.
+
+ If optional is set to false and
the specified key does not exist,
+ an error will be returned during
Pod creation.
+ type: boolean
+ path:
+ description: |-
+ The path within the volume from
which to select the file.
+ Must be relative and may not
contain the '..' path or start with '..'.
+ type: string
+ volumeName:
+ description: The name of the volume
mount
+ containing the env file.
+ type: string
+ required:
+ - key
+ - path
+ - volumeName
+ type: object
+ x-kubernetes-map-type: atomic
resourceFieldRef:
description: |-
Selects a resource of the container:
only resources limits and requests
@@ -2355,10 +2601,13 @@ spec:
from. Must be a valid secret key.
type: string
name:
+ default: ""
description: |-
Name of the referent.
+ This field is effectively
required, but due to backwards compatibility is
+ allowed to be empty. Instances of
this type with an empty value here are
+ almost certainly wrong.
More info:
https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields.
apiVersion, kind, uid?
type: string
optional:
description: Specify whether the
Secret
@@ -2415,6 +2664,10 @@ spec:
version:
description: Version of storage.
type: string
+ required:
+ - connectType
+ - type
+ - version
type: object
status:
description: StorageStatus defines the observed state
of Storage
@@ -2456,6 +2709,8 @@ spec:
name:
description: Name relevant settings
type: string
+ required:
+ - name
type: object
version:
description: Version of OAP.
@@ -2521,20 +2776,9 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include
"operator.fullname" . }}-serving-cert
- controller-gen.kubebuilder.io/version: v0.14.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: satellites.operator.skywalking.apache.org
spec:
- conversion:
- strategy: Webhook
- webhook:
- clientConfig:
- service:
- name: skywalking-swck-webhook-service
- namespace: {{ .Release.Namespace }}
- path: /convert
- conversionReviewVersions:
- - v1
group: operator.skywalking.apache.org
names:
kind: Satellite
@@ -2600,7 +2844,9 @@ spec:
a Container.
properties:
name:
- description: Name of the environment variable. Must be a
C_IDENTIFIER.
+ description: |-
+ Name of the environment variable.
+ May consist of any printable ASCII characters except
'='.
type: string
value:
description: |-
@@ -2625,10 +2871,13 @@ spec:
description: The key to select.
type: string
name:
+ default: ""
description: |-
Name of the referent.
+ This field is effectively required, but due to
backwards compatibility is
+ allowed to be empty. Instances of this type
with an empty value here are
+ almost certainly wrong.
More info:
https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
kind, uid?
type: string
optional:
description: Specify whether the ConfigMap or
its key
@@ -2655,6 +2904,43 @@ spec:
- fieldPath
type: object
x-kubernetes-map-type: atomic
+ fileKeyRef:
+ description: |-
+ FileKeyRef selects a key of the env file.
+ Requires the EnvFiles feature gate to be enabled.
+ properties:
+ key:
+ description: |-
+ The key within the env file. An invalid key
will prevent the pod from starting.
+ The keys defined within a source may consist
of any printable ASCII characters except '='.
+ During Alpha stage of the EnvFiles feature
gate, the key size is limited to 128 characters.
+ type: string
+ optional:
+ default: false
+ description: |-
+ Specify whether the file or its key must be
defined. If the file or key
+ does not exist, then the env var is not
published.
+ If optional is set to true and the specified
key does not exist,
+ the environment variable will not be set in
the Pod's containers.
+
+ If optional is set to false and the specified
key does not exist,
+ an error will be returned during Pod creation.
+ type: boolean
+ path:
+ description: |-
+ The path within the volume from which to
select the file.
+ Must be relative and may not contain the '..'
path or start with '..'.
+ type: string
+ volumeName:
+ description: The name of the volume mount
containing
+ the env file.
+ type: string
+ required:
+ - key
+ - path
+ - volumeName
+ type: object
+ x-kubernetes-map-type: atomic
resourceFieldRef:
description: |-
Selects a resource of the container: only
resources limits and requests
@@ -2687,10 +2973,13 @@ spec:
be a valid secret key.
type: string
name:
+ default: ""
description: |-
Name of the referent.
+ This field is effectively required, but due to
backwards compatibility is
+ allowed to be empty. Instances of this type
with an empty value here are
+ almost certainly wrong.
More info:
https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
kind, uid?
type: string
optional:
description: Specify whether the Secret or its
key must
@@ -2873,20 +3162,9 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include
"operator.fullname" . }}-serving-cert
- controller-gen.kubebuilder.io/version: v0.14.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: storages.operator.skywalking.apache.org
spec:
- conversion:
- strategy: Webhook
- webhook:
- clientConfig:
- service:
- name: skywalking-swck-webhook-service
- namespace: {{ .Release.Namespace }}
- path: /convert
- conversionReviewVersions:
- - v1
group: operator.skywalking.apache.org
names:
kind: Storage
@@ -2947,7 +3225,9 @@ spec:
a Container.
properties:
name:
- description: Name of the environment variable. Must be a
C_IDENTIFIER.
+ description: |-
+ Name of the environment variable.
+ May consist of any printable ASCII characters except
'='.
type: string
value:
description: |-
@@ -2972,10 +3252,13 @@ spec:
description: The key to select.
type: string
name:
+ default: ""
description: |-
Name of the referent.
+ This field is effectively required, but due to
backwards compatibility is
+ allowed to be empty. Instances of this type
with an empty value here are
+ almost certainly wrong.
More info:
https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
kind, uid?
type: string
optional:
description: Specify whether the ConfigMap or
its key
@@ -3002,6 +3285,43 @@ spec:
- fieldPath
type: object
x-kubernetes-map-type: atomic
+ fileKeyRef:
+ description: |-
+ FileKeyRef selects a key of the env file.
+ Requires the EnvFiles feature gate to be enabled.
+ properties:
+ key:
+ description: |-
+ The key within the env file. An invalid key
will prevent the pod from starting.
+ The keys defined within a source may consist
of any printable ASCII characters except '='.
+ During Alpha stage of the EnvFiles feature
gate, the key size is limited to 128 characters.
+ type: string
+ optional:
+ default: false
+ description: |-
+ Specify whether the file or its key must be
defined. If the file or key
+ does not exist, then the env var is not
published.
+ If optional is set to true and the specified
key does not exist,
+ the environment variable will not be set in
the Pod's containers.
+
+ If optional is set to false and the specified
key does not exist,
+ an error will be returned during Pod creation.
+ type: boolean
+ path:
+ description: |-
+ The path within the volume from which to
select the file.
+ Must be relative and may not contain the '..'
path or start with '..'.
+ type: string
+ volumeName:
+ description: The name of the volume mount
containing
+ the env file.
+ type: string
+ required:
+ - key
+ - path
+ - volumeName
+ type: object
+ x-kubernetes-map-type: atomic
resourceFieldRef:
description: |-
Selects a resource of the container: only
resources limits and requests
@@ -3034,10 +3354,13 @@ spec:
be a valid secret key.
type: string
name:
+ default: ""
description: |-
Name of the referent.
+ This field is effectively required, but due to
backwards compatibility is
+ allowed to be empty. Instances of this type
with an empty value here are
+ almost certainly wrong.
More info:
https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
kind, uid?
type: string
optional:
description: Specify whether the Secret or its
key must
@@ -3093,6 +3416,10 @@ spec:
version:
description: Version of storage.
type: string
+ required:
+ - connectType
+ - type
+ - version
type: object
status:
description: StorageStatus defines the observed state of Storage
@@ -3138,7 +3465,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.14.0
+ controller-gen.kubebuilder.io/version: v0.19.0
name: swagents.operator.skywalking.apache.org
spec:
group: operator.skywalking.apache.org
@@ -3206,8 +3533,9 @@ spec:
in a Container.
properties:
name:
- description: Name of the environment variable. Must
be a
- C_IDENTIFIER.
+ description: |-
+ Name of the environment variable.
+ May consist of any printable ASCII characters
except '='.
type: string
value:
description: |-
@@ -3232,10 +3560,13 @@ spec:
description: The key to select.
type: string
name:
+ default: ""
description: |-
Name of the referent.
+ This field is effectively required, but
due to backwards compatibility is
+ allowed to be empty. Instances of this
type with an empty value here are
+ almost certainly wrong.
More info:
https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
kind, uid?
type: string
optional:
description: Specify whether the ConfigMap
or its
@@ -3262,6 +3593,43 @@ spec:
- fieldPath
type: object
x-kubernetes-map-type: atomic
+ fileKeyRef:
+ description: |-
+ FileKeyRef selects a key of the env file.
+ Requires the EnvFiles feature gate to be
enabled.
+ properties:
+ key:
+ description: |-
+ The key within the env file. An invalid
key will prevent the pod from starting.
+ The keys defined within a source may
consist of any printable ASCII characters except '='.
+ During Alpha stage of the EnvFiles feature
gate, the key size is limited to 128 characters.
+ type: string
+ optional:
+ default: false
+ description: |-
+ Specify whether the file or its key must
be defined. If the file or key
+ does not exist, then the env var is not
published.
+ If optional is set to true and the
specified key does not exist,
+ the environment variable will not be set
in the Pod's containers.
+
+ If optional is set to false and the
specified key does not exist,
+ an error will be returned during Pod
creation.
+ type: boolean
+ path:
+ description: |-
+ The path within the volume from which to
select the file.
+ Must be relative and may not contain the
'..' path or start with '..'.
+ type: string
+ volumeName:
+ description: The name of the volume mount
containing
+ the env file.
+ type: string
+ required:
+ - key
+ - path
+ - volumeName
+ type: object
+ x-kubernetes-map-type: atomic
resourceFieldRef:
description: |-
Selects a resource of the container: only
resources limits and requests
@@ -3295,10 +3663,13 @@ spec:
be a valid secret key.
type: string
name:
+ default: ""
description: |-
Name of the referent.
+ This field is effectively required, but
due to backwards compatibility is
+ allowed to be empty. Instances of this
type with an empty value here are
+ almost certainly wrong.
More info:
https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
kind, uid?
type: string
optional:
description: Specify whether the Secret or
its key
@@ -3331,11 +3702,9 @@ spec:
Claims lists the names of resources, defined in
spec.resourceClaims,
that are used by this container.
-
- This is an alpha field and requires enabling the
+ This field depends on the
DynamicResourceAllocation feature gate.
-
This field is immutable. It can only be set for
containers.
items:
description: ResourceClaim references one entry in
PodSpec.ResourceClaims.
@@ -3346,6 +3715,12 @@ spec:
the Pod where this field is used. It makes
that resource available
inside a container.
type: string
+ request:
+ description: |-
+ Request is the name chosen for a request in
the referenced claim.
+ If empty, everything from the claim is made
available, otherwise
+ only the result of this request.
+ type: string
required:
- name
type: object
@@ -3423,20 +3798,9 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include
"operator.fullname" . }}-serving-cert
controller-gen.kubebuilder.io/version: v0.19.0
name: uis.operator.skywalking.apache.org
spec:
- conversion:
- strategy: Webhook
- webhook:
- clientConfig:
- service:
- name: skywalking-swck-webhook-service
- namespace: {{ .Release.Namespace }}
- path: /convert
- conversionReviewVersions:
- - v1
group: operator.skywalking.apache.org
names:
kind: UI
diff --git a/chart/operator/templates/rbac.yaml
b/chart/operator/templates/rbac.yaml
index 9d6b265..8e4d647 100644
--- a/chart/operator/templates/rbac.yaml
+++ b/chart/operator/templates/rbac.yaml
@@ -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:
@@ -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
@@ -145,17 +108,6 @@ rules:
- apps
resources:
- deployments
- verbs:
- - create
- - delete
- - get
- - list
- - patch
- - update
- - watch
-- apiGroups:
- - apps
- resources:
- statefulsets
verbs:
- create
@@ -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
@@ -389,13 +178,25 @@ 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
@@ -403,21 +204,10 @@ rules:
- 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:
diff --git a/chart/operator/values.yaml b/chart/operator/values.yaml
index 9cca874..196eb12 100644
--- a/chart/operator/values.yaml
+++ b/chart/operator/values.yaml
@@ -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:
diff --git a/chart/skywalking/README.md b/chart/skywalking/README.md
index 53ca136..21c838b 100644
--- a/chart/skywalking/README.md
+++ b/chart/skywalking/README.md
@@ -77,7 +77,7 @@ The following table lists the configurable parameters of the
Skywalking chart an
| `ui.name` | Web UI deployment name
| `ui`
|
| `ui.replicas` | Web UI k8s deployment replicas.
Keep at `1` unless your ingress provides sticky sessions — the Horizon BFF
holds the session table in memory
| `1`
|
| `ui.image.repository` | Horizon UI container image. Release
images: Docker Hub `apache/skywalking-ui` tagged `horizon-x.y.z`. Dev images:
`ghcr.io/apache/skywalking-horizon-ui`
|
`skywalking.docker.scarf.sh/apache/skywalking-ui`
|
-| `ui.image.tag` | Horizon UI image tag (required),
e.g. `horizon-1.0.0`
| `null`
|
+| `ui.image.tag` | Horizon UI image tag (required),
e.g. `horizon-0.6.0`
| `null`
|
| `ui.image.pullPolicy` | Web UI container image pull policy
| `IfNotPresent`
|
| `ui.nodeAffinity` | Web UI node affinity policy
| `{}`
|
| `ui.nodeSelector` | Web UI labels for pod assignment
| `{}`
|
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 0f24c3c..e83947d 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -153,11 +153,11 @@ ui:
replicas: 1
image:
# Horizon UI release images ship to Docker Hub `apache/skywalking-ui`
- # tagged `horizon-<x.y.z>` (e.g. `horizon-1.0.0`). Dev / pre-release
+ # tagged `horizon-<x.y.z>` (e.g. `horizon-0.6.0`). Dev / pre-release
# images live at `ghcr.io/apache/skywalking-horizon-ui` and are tagged
# by SHA / `vX.Y.Z` / `main`.
repository: skywalking.docker.scarf.sh/apache/skywalking-ui
- tag: null # Must be set explicitly, e.g. horizon-1.0.0
+ tag: null # Must be set explicitly, e.g. horizon-0.6.0
pullPolicy: IfNotPresent
# podAnnotations:
# example: oap-foo
diff --git a/test/e2e/env b/test/e2e/env
index a9097f4..fe4912a 100644
--- a/test/e2e/env
+++ b/test/e2e/env
@@ -13,22 +13,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-OAP_TAG=a0cec0ca237792497d2da0b65757d11f58c3f342
+OAP_TAG=2aa0e8502a928c7066a01f864ee32122f12dfcae
OAP_REPO=ghcr.io/apache/skywalking/oap
# Horizon UI dev images are published to GHCR by the
apache/skywalking-horizon-ui
# repo (tags: full commit SHA, vX.Y.Z, main). Release images live on Docker Hub
# at apache/skywalking-ui:horizon-x.y.z. CI pins to a SHA so re-runs are
# reproducible — bump this when a new horizon-ui feature/fix needs CI coverage.
-UI_TAG=80565f563b6ea47c274141029d8ef6bd33b7eeac
+UI_TAG=58a4c1fb61478936f317136400d6dbd0cdda5ee1
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
+BANYANDB_TAG=65d951f1c464bd85770c51b4d69a0a28ed861a1e
BANYANDB_REPO=ghcr.io/apache/skywalking-banyandb
SW_CTL_COMMIT=9a1beab08413ce415a00a8547a238a14691c5655
diff --git a/test/e2e/swck/oap-agent-adapter-hpa.yaml
b/test/e2e/swck/oap-agent-adapter-hpa.yaml
index 96ac3a4..4028cee 100644
--- a/test/e2e/swck/oap-agent-adapter-hpa.yaml
+++ b/test/e2e/swck/oap-agent-adapter-hpa.yaml
@@ -91,14 +91,14 @@ setup:
- name: Setup java agent demo
command: |
kubectl label namespace skywalking-system swck-injection=enabled
- curl
https://raw.githubusercontent.com/apache/skywalking-swck/v0.9.0/test/e2e/demo.yaml
| sed 's/oap-service/skywalking-system-oap.skywalking-system/' | kubectl apply
-f -
+ curl
https://raw.githubusercontent.com/apache/skywalking-swck/v0.10.0/test/e2e/demo.yaml
| sed 's/oap-service/skywalking-system-oap.skywalking-system/' | kubectl apply
-f -
wait:
- namespace: skywalking-system
resource: deployment/demo
for: condition=Available
- name: Setup the hpa of java agent demo
command: |
- curl
https://raw.githubusercontent.com/apache/skywalking-swck/v0.9.0/test/e2e/hpa-demo.yaml
| kubectl apply -f -
+ curl
https://raw.githubusercontent.com/apache/skywalking-swck/v0.10.0/test/e2e/hpa-demo.yaml
| kubectl apply -f -
timeout: 20m
cleanup:
diff --git a/test/e2e/swck/oap-agent-banyandb.yaml
b/test/e2e/swck/oap-agent-banyandb.yaml
index 364b349..7d42c67 100644
--- a/test/e2e/swck/oap-agent-banyandb.yaml
+++ b/test/e2e/swck/oap-agent-banyandb.yaml
@@ -82,7 +82,7 @@ setup:
- name: Setup java agent demo
command: |
kubectl label namespace skywalking-system swck-injection=enabled
- curl
https://raw.githubusercontent.com/apache/skywalking-swck/v0.9.0/test/e2e/demo.yaml
| sed 's/oap-service/skywalking-system-oap.skywalking-system/' | kubectl apply
-f -
+ curl
https://raw.githubusercontent.com/apache/skywalking-swck/v0.10.0/test/e2e/demo.yaml
| sed 's/oap-service/skywalking-system-oap.skywalking-system/' | kubectl apply
-f -
wait:
- namespace: skywalking-system
resource: deployment/demo
diff --git a/test/e2e/swck/oap-ui-agent-elasticsearch.yaml
b/test/e2e/swck/oap-ui-agent-elasticsearch.yaml
index 994f441..6c5e5fb 100644
--- a/test/e2e/swck/oap-ui-agent-elasticsearch.yaml
+++ b/test/e2e/swck/oap-ui-agent-elasticsearch.yaml
@@ -72,7 +72,7 @@ setup:
- name: Setup java agent demo
command: |
kubectl label namespace skywalking-system swck-injection=enabled
- curl
https://raw.githubusercontent.com/apache/skywalking-swck/v0.9.0/test/e2e/demo.yaml
| sed 's/oap-service/skywalking-system-oap.skywalking-system/' | kubectl apply
-f -
+ curl
https://raw.githubusercontent.com/apache/skywalking-swck/v0.10.0/test/e2e/demo.yaml
| sed 's/oap-service/skywalking-system-oap.skywalking-system/' | kubectl apply
-f -
wait:
- namespace: skywalking-system
resource: deployment/demo
diff --git a/test/e2e/swck/oap-ui-agent-oapserverconfig.yaml
b/test/e2e/swck/oap-ui-agent-oapserverconfig.yaml
index 46c7bc6..0e1f4c1 100644
--- a/test/e2e/swck/oap-ui-agent-oapserverconfig.yaml
+++ b/test/e2e/swck/oap-ui-agent-oapserverconfig.yaml
@@ -85,7 +85,7 @@ setup:
- name: setup java agent demo(test for dynamic configuration)
command: |
kubectl label namespace skywalking-system swck-injection=enabled
- curl
https://raw.githubusercontent.com/apache/skywalking-swck/e98e180da09ff7cb98e82001542dcf002cece1cf/test/e2e/demo.yaml
| sed 's/oap-service/skywalking-system-oap.skywalking-system/' | kubectl
create -f -
+ curl
https://raw.githubusercontent.com/apache/skywalking-swck/v0.10.0/test/e2e/demo.yaml
| sed 's/oap-service/skywalking-system-oap.skywalking-system/' | kubectl
create -f -
wait:
- namespace: skywalking-system
resource: deployment/demo
@@ -93,7 +93,7 @@ setup:
- name: setup oapserverconfig(static configuration) and wait for pod
restart
command: |
oap_podname=$(kubectl get pod -lapp=oap -n skywalking-system -o
jsonpath='{.items[*].metadata.name}')
- curl
https://raw.githubusercontent.com/apache/skywalking-swck/e98e180da09ff7cb98e82001542dcf002cece1cf/test/e2e/oapserverconfig-demo.yaml
| \
+ curl
https://raw.githubusercontent.com/apache/skywalking-swck/v0.10.0/test/e2e/oapserverconfig-demo.yaml
| \
sed 's/version: 9.5.0/version: latest/' | \
sed '/env:/a\ - name: SW_STORAGE\n value: banyandb\n -
name: SW_STORAGE_BANYANDB_TARGETS\n value: banyandb-grpc.default:17912' | \
kubectl apply -f -
@@ -103,14 +103,14 @@ setup:
done
- name: setup java agent demo(test for static configuration)
command: |
- curl
https://raw.githubusercontent.com/apache/skywalking-swck/e98e180da09ff7cb98e82001542dcf002cece1cf/test/e2e/resource.yaml
| sed 's/oap-service/skywalking-system-oap.skywalking-system/' | kubectl
create -f -
+ curl
https://raw.githubusercontent.com/apache/skywalking-swck/v0.10.0/test/e2e/resource.yaml
| sed 's/oap-service/skywalking-system-oap.skywalking-system/' | kubectl
create -f -
wait:
- namespace: skywalking-system
resource: deployment/songs-deployment
for: condition=Available
- name: setup oapserverdynamicconfig(dynamic configuration)
command: |
- curl
https://raw.githubusercontent.com/apache/skywalking-swck/e98e180da09ff7cb98e82001542dcf002cece1cf/test/e2e/oapserverdynamicconfig-demo.yaml
| sed 's/default: 0.1/default: 500/' | kubectl apply -f -
+ curl
https://raw.githubusercontent.com/apache/skywalking-swck/v0.10.0/test/e2e/oapserverdynamicconfig-demo.yaml
| sed 's/default: 0.1/default: 500/' | kubectl apply -f -
timeout: 20m
cleanup:
diff --git a/test/e2e/swck/oap-ui-agent-satellite.yaml
b/test/e2e/swck/oap-ui-agent-satellite.yaml
index c2822cb..88b5a53 100644
--- a/test/e2e/swck/oap-ui-agent-satellite.yaml
+++ b/test/e2e/swck/oap-ui-agent-satellite.yaml
@@ -85,7 +85,7 @@ setup:
- name: Setup java agent demo
command: |
kubectl label namespace skywalking-system swck-injection=enabled
- curl
https://raw.githubusercontent.com/apache/skywalking-swck/v0.9.0/test/e2e/demo.yaml
| sed 's/oap-service/skywalking-system-satellite.skywalking-system/' | kubectl
apply -f -
+ curl
https://raw.githubusercontent.com/apache/skywalking-swck/v0.10.0/test/e2e/demo.yaml
| sed 's/oap-service/skywalking-system-satellite.skywalking-system/' | kubectl
apply -f -
wait:
- namespace: skywalking-system
resource: deployment/demo
