From 8634d9fd2f2dc7513f526eb5825cc3b3a74e8378 Mon Sep 17 00:00:00 2001 From: chaer Date: Wed, 20 Sep 2023 13:59:29 +0800 Subject: [PATCH] rename kafed -> operating, bump ctrlmesh to v0.1.0 --- charts/ctrlmesh | 2 +- charts/demo-operator | 1 - charts/kafed | 1 - charts/operating | 1 + charts/sample-operator | 1 + versions/ctrlmesh/0.1.0-beta.6/values.yaml | 49 ------------------ .../{0.1.0-beta.6 => 0.1.0}/Chart.yaml | 4 +- .../{0.1.0-beta.6 => 0.1.0}/README.md | 0 .../templates/NOTES.txt | 0 .../templates/_helpers.tpl | 0 .../templates/configmap.yaml | 0 .../templates/crd/circuitbreakers.yaml | 0 .../templates/crd/managerstates.yaml | 0 .../templates/crd/shardingconfigs.yaml | 0 .../templates/deployment.yaml | 17 +++---- .../templates/namespace.yaml | 2 +- .../templates/rbac/leader_election_role.yaml | 0 .../rbac/leader_election_role_binding.yaml | 0 .../rbac/managerstate_editor_role.yaml | 0 .../rbac/managerstate_viewer_role.yaml | 0 .../templates/rbac/public_role.yaml | 0 .../templates/rbac/public_role_binding.yaml | 0 .../templates/rbac/role.yaml | 0 .../templates/rbac/role_binding.yaml | 0 .../templates/service.yaml | 0 .../templates/serviceaccount.yaml | 0 .../templates/webhook/mutating.yaml | 0 .../templates/webhook/validating.yaml | 0 versions/ctrlmesh/0.1.0/values.yaml | 51 +++++++++++++++++++ .../0.1.0-beta.0/Chart.yaml | 6 +-- .../0.1.0-beta.0}/README.md | 0 .../0.1.0-beta.0/templates/NOTES.txt | 0 .../0.1.0-beta.0/templates/_helpers.tpl | 0 .../crd/apps.kusionstack.io_collasets.yaml | 0 .../apps.kusionstack.io_resourcecontexts.yaml | 0 .../crd/apps.kusionstack.io_rulesets.yaml | 0 .../0.1.0-beta.0/templates/deployment.yaml | 0 .../0.1.0-beta.0/templates/namespace.yaml | 2 +- .../0.1.0-beta.0/templates/rbac/rbac.yaml | 0 .../0.1.0-beta.0/templates/service.yaml | 0 .../templates/webhook/webhook.yaml | 0 .../0.1.0-beta.0/values.yaml | 12 ++--- .../0.1.1/Chart.yaml | 6 +-- .../0.1.1}/README.md | 0 .../0.1.1/templates/NOTES.txt | 0 .../0.1.1/templates/configmap.yaml | 32 ++++++++++++ .../0.1.1/templates/namesapce.yaml | 20 ++++++++ .../0.1.1/templates/rbac.yaml | 12 ++--- .../0.1.1/templates/shardingconfig.yaml | 4 +- .../0.1.1/templates/statefulset.yaml | 14 ++--- .../0.1.1/values.yaml | 4 +- 51 files changed, 147 insertions(+), 94 deletions(-) delete mode 120000 charts/demo-operator delete mode 120000 charts/kafed create mode 120000 charts/operating create mode 120000 charts/sample-operator delete mode 100644 versions/ctrlmesh/0.1.0-beta.6/values.yaml rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/Chart.yaml (93%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/README.md (100%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/NOTES.txt (100%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/_helpers.tpl (100%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/configmap.yaml (100%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/crd/circuitbreakers.yaml (100%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/crd/managerstates.yaml (100%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/crd/shardingconfigs.yaml (100%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/deployment.yaml (77%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/namespace.yaml (69%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/rbac/leader_election_role.yaml (100%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/rbac/leader_election_role_binding.yaml (100%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/rbac/managerstate_editor_role.yaml (100%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/rbac/managerstate_viewer_role.yaml (100%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/rbac/public_role.yaml (100%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/rbac/public_role_binding.yaml (100%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/rbac/role.yaml (100%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/rbac/role_binding.yaml (100%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/service.yaml (100%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/serviceaccount.yaml (100%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/webhook/mutating.yaml (100%) rename versions/ctrlmesh/{0.1.0-beta.6 => 0.1.0}/templates/webhook/validating.yaml (100%) create mode 100644 versions/ctrlmesh/0.1.0/values.yaml rename versions/{kafed => operating}/0.1.0-beta.0/Chart.yaml (85%) rename versions/{demo-operator/0.1.1 => operating/0.1.0-beta.0}/README.md (100%) rename versions/{kafed => operating}/0.1.0-beta.0/templates/NOTES.txt (100%) rename versions/{kafed => operating}/0.1.0-beta.0/templates/_helpers.tpl (100%) rename versions/{kafed => operating}/0.1.0-beta.0/templates/crd/apps.kusionstack.io_collasets.yaml (100%) rename versions/{kafed => operating}/0.1.0-beta.0/templates/crd/apps.kusionstack.io_resourcecontexts.yaml (100%) rename versions/{kafed => operating}/0.1.0-beta.0/templates/crd/apps.kusionstack.io_rulesets.yaml (100%) rename versions/{kafed => operating}/0.1.0-beta.0/templates/deployment.yaml (100%) rename versions/{kafed => operating}/0.1.0-beta.0/templates/namespace.yaml (84%) rename versions/{kafed => operating}/0.1.0-beta.0/templates/rbac/rbac.yaml (100%) rename versions/{kafed => operating}/0.1.0-beta.0/templates/service.yaml (100%) rename versions/{kafed => operating}/0.1.0-beta.0/templates/webhook/webhook.yaml (100%) rename versions/{kafed => operating}/0.1.0-beta.0/values.yaml (66%) rename versions/{demo-operator => sample-operator}/0.1.1/Chart.yaml (84%) rename versions/{kafed/0.1.0-beta.0 => sample-operator/0.1.1}/README.md (100%) rename versions/{demo-operator => sample-operator}/0.1.1/templates/NOTES.txt (100%) rename versions/{demo-operator => sample-operator}/0.1.1/templates/configmap.yaml (79%) rename versions/{demo-operator => sample-operator}/0.1.1/templates/namesapce.yaml (79%) rename versions/{demo-operator => sample-operator}/0.1.1/templates/rbac.yaml (77%) rename versions/{demo-operator => sample-operator}/0.1.1/templates/shardingconfig.yaml (90%) rename versions/{demo-operator => sample-operator}/0.1.1/templates/statefulset.yaml (80%) rename versions/{demo-operator => sample-operator}/0.1.1/values.yaml (89%) diff --git a/charts/ctrlmesh b/charts/ctrlmesh index 3e8b44b..6cc5640 120000 --- a/charts/ctrlmesh +++ b/charts/ctrlmesh @@ -1 +1 @@ -../versions/ctrlmesh/0.1.0-beta.6 \ No newline at end of file +../versions/ctrlmesh/0.1.0 \ No newline at end of file diff --git a/charts/demo-operator b/charts/demo-operator deleted file mode 120000 index a2917ff..0000000 --- a/charts/demo-operator +++ /dev/null @@ -1 +0,0 @@ -../versions/demo-operator/0.1.1 \ No newline at end of file diff --git a/charts/kafed b/charts/kafed deleted file mode 120000 index afd0137..0000000 --- a/charts/kafed +++ /dev/null @@ -1 +0,0 @@ -../versions/kafed/0.1.0-beta.0 \ No newline at end of file diff --git a/charts/operating b/charts/operating new file mode 120000 index 0000000..88f5fd5 --- /dev/null +++ b/charts/operating @@ -0,0 +1 @@ +../versions/operating/0.1.0-beta.0 \ No newline at end of file diff --git a/charts/sample-operator b/charts/sample-operator new file mode 120000 index 0000000..9476929 --- /dev/null +++ b/charts/sample-operator @@ -0,0 +1 @@ +../versions/sample-operator/0.1.1 \ No newline at end of file diff --git a/versions/ctrlmesh/0.1.0-beta.6/values.yaml b/versions/ctrlmesh/0.1.0-beta.6/values.yaml deleted file mode 100644 index 022bab4..0000000 --- a/versions/ctrlmesh/0.1.0-beta.6/values.yaml +++ /dev/null @@ -1,49 +0,0 @@ -# Default values for Controller Mesh. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 2 - -namespace: ctrlmesh -namesapceEnabled: true - -imageTag: v0.1.0-beta.6 -proxyImage: - repository: kusionstack/ctrlmesh-proxy - pullPolicy: IfNotPresent - -managerImage: - repository: kusionstack/ctrlmesh-manager - pullPolicy: IfNotPresent - -initImage: kusionstack/ctrlmesh-init - -managerResources: - limits: - cpu: 500m - memory: 128Mi - requests: - cpu: 10m - memory: 64Mi - -proxyResources: - cpu: 100m - memory: 100Mi - ephemeralStorage: 100Mi - -shardingGroupVersionKinds: - groupVersionKinds: - ctrlmesh.kusionstack.io/v1alpha1: - - '*' - v1: - - Pod - - PersistentVolumeClaim - - Service - - ConfigMap - - Endpoint - apps/v1: - - StatefulSet - - ReplicaSet - - ControllerRevision - - diff --git a/versions/ctrlmesh/0.1.0-beta.6/Chart.yaml b/versions/ctrlmesh/0.1.0/Chart.yaml similarity index 93% rename from versions/ctrlmesh/0.1.0-beta.6/Chart.yaml rename to versions/ctrlmesh/0.1.0/Chart.yaml index 902cdb9..2376f66 100644 --- a/versions/ctrlmesh/0.1.0-beta.6/Chart.yaml +++ b/versions/ctrlmesh/0.1.0/Chart.yaml @@ -4,12 +4,12 @@ description: Helm chart for Controller-Mesh components # 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: 0.1.0-beta.6 +version: 0.1.0 # This is the version number of the application being deployed. This version number should be # 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: 0.1.0-beta.6 +appVersion: 0.1.0 home: https://KusionStack.io sources: diff --git a/versions/ctrlmesh/0.1.0-beta.6/README.md b/versions/ctrlmesh/0.1.0/README.md similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/README.md rename to versions/ctrlmesh/0.1.0/README.md diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/NOTES.txt b/versions/ctrlmesh/0.1.0/templates/NOTES.txt similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/templates/NOTES.txt rename to versions/ctrlmesh/0.1.0/templates/NOTES.txt diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/_helpers.tpl b/versions/ctrlmesh/0.1.0/templates/_helpers.tpl similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/templates/_helpers.tpl rename to versions/ctrlmesh/0.1.0/templates/_helpers.tpl diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/configmap.yaml b/versions/ctrlmesh/0.1.0/templates/configmap.yaml similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/templates/configmap.yaml rename to versions/ctrlmesh/0.1.0/templates/configmap.yaml diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/crd/circuitbreakers.yaml b/versions/ctrlmesh/0.1.0/templates/crd/circuitbreakers.yaml similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/templates/crd/circuitbreakers.yaml rename to versions/ctrlmesh/0.1.0/templates/crd/circuitbreakers.yaml diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/crd/managerstates.yaml b/versions/ctrlmesh/0.1.0/templates/crd/managerstates.yaml similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/templates/crd/managerstates.yaml rename to versions/ctrlmesh/0.1.0/templates/crd/managerstates.yaml diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/crd/shardingconfigs.yaml b/versions/ctrlmesh/0.1.0/templates/crd/shardingconfigs.yaml similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/templates/crd/shardingconfigs.yaml rename to versions/ctrlmesh/0.1.0/templates/crd/shardingconfigs.yaml diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/deployment.yaml b/versions/ctrlmesh/0.1.0/templates/deployment.yaml similarity index 77% rename from versions/ctrlmesh/0.1.0-beta.6/templates/deployment.yaml rename to versions/ctrlmesh/0.1.0/templates/deployment.yaml index 53f0f72..7795217 100644 --- a/versions/ctrlmesh/0.1.0-beta.6/templates/deployment.yaml +++ b/versions/ctrlmesh/0.1.0/templates/deployment.yaml @@ -6,7 +6,7 @@ metadata: name: ctrlmesh namespace: {{ .Values.namespace }} spec: - replicas: {{ .Values.replicaCount }} + replicas: {{ .Values.manager.replicas }} revisionHistoryLimit: 10 selector: matchLabels: @@ -28,11 +28,10 @@ spec: - --logtostderr=true - --v=4 - --leader-election-namespace={{ .Values.namespace }} - - --proxy-image={{ .Values.proxyImage.repository }}:{{ .Values.imageTag }} - - --proxy-cpu={{ .Values.proxyResources.cpu }} - - --proxy-memory={{ .Values.proxyResources.memory }} - - --proxy-ephemeral-storage={{ .Values.proxyResources.ephemeralStorage }} - - --proxy-image-pull-policy={{ .Values.proxyImage.pullPolicy }} + - --proxy-image={{ .Values.proxy.image.repo }}:{{ .Values.proxy.image.tag }} + - --proxy-cpu={{ .Values.proxy.resources.cpu }} + - --proxy-memory={{ .Values.proxy.resources.memory }} + - --proxy-image-pull-policy={{ .Values.proxy.image.pullPolicy }} command: - /ctrlmesh-manager env: @@ -52,8 +51,8 @@ spec: value: secret - name: WATCH_ON_LIMIT value: 'true' - image: {{ .Values.managerImage.repository }}:{{ .Values.imageTag }} - imagePullPolicy: {{ .Values.managerImage.pullPolicy }} + image: {{ .Values.manager.image.repo }}:{{ .Values.manager.image.tag }} + imagePullPolicy: {{ .Values.manager.image.pullPolicy }} livenessProbe: failureThreshold: 3 httpGet: @@ -76,7 +75,7 @@ spec: successThreshold: 1 timeoutSeconds: 2 resources: - {{- toYaml .Values.managerResources | nindent 12 }} + {{- toYaml .Values.manager.resources | nindent 12 }} securityContext: allowPrivilegeEscalation: false terminationMessagePath: /dev/termination-log diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/namespace.yaml b/versions/ctrlmesh/0.1.0/templates/namespace.yaml similarity index 69% rename from versions/ctrlmesh/0.1.0-beta.6/templates/namespace.yaml rename to versions/ctrlmesh/0.1.0/templates/namespace.yaml index ab81ea1..f55e183 100644 --- a/versions/ctrlmesh/0.1.0-beta.6/templates/namespace.yaml +++ b/versions/ctrlmesh/0.1.0/templates/namespace.yaml @@ -1,4 +1,4 @@ -{{- if .Values.namesapceEnabled -}} +{{- if .Values.namespaceEnabled -}} apiVersion: v1 kind: Namespace metadata: diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/rbac/leader_election_role.yaml b/versions/ctrlmesh/0.1.0/templates/rbac/leader_election_role.yaml similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/templates/rbac/leader_election_role.yaml rename to versions/ctrlmesh/0.1.0/templates/rbac/leader_election_role.yaml diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/rbac/leader_election_role_binding.yaml b/versions/ctrlmesh/0.1.0/templates/rbac/leader_election_role_binding.yaml similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/templates/rbac/leader_election_role_binding.yaml rename to versions/ctrlmesh/0.1.0/templates/rbac/leader_election_role_binding.yaml diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/rbac/managerstate_editor_role.yaml b/versions/ctrlmesh/0.1.0/templates/rbac/managerstate_editor_role.yaml similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/templates/rbac/managerstate_editor_role.yaml rename to versions/ctrlmesh/0.1.0/templates/rbac/managerstate_editor_role.yaml diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/rbac/managerstate_viewer_role.yaml b/versions/ctrlmesh/0.1.0/templates/rbac/managerstate_viewer_role.yaml similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/templates/rbac/managerstate_viewer_role.yaml rename to versions/ctrlmesh/0.1.0/templates/rbac/managerstate_viewer_role.yaml diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/rbac/public_role.yaml b/versions/ctrlmesh/0.1.0/templates/rbac/public_role.yaml similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/templates/rbac/public_role.yaml rename to versions/ctrlmesh/0.1.0/templates/rbac/public_role.yaml diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/rbac/public_role_binding.yaml b/versions/ctrlmesh/0.1.0/templates/rbac/public_role_binding.yaml similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/templates/rbac/public_role_binding.yaml rename to versions/ctrlmesh/0.1.0/templates/rbac/public_role_binding.yaml diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/rbac/role.yaml b/versions/ctrlmesh/0.1.0/templates/rbac/role.yaml similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/templates/rbac/role.yaml rename to versions/ctrlmesh/0.1.0/templates/rbac/role.yaml diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/rbac/role_binding.yaml b/versions/ctrlmesh/0.1.0/templates/rbac/role_binding.yaml similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/templates/rbac/role_binding.yaml rename to versions/ctrlmesh/0.1.0/templates/rbac/role_binding.yaml diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/service.yaml b/versions/ctrlmesh/0.1.0/templates/service.yaml similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/templates/service.yaml rename to versions/ctrlmesh/0.1.0/templates/service.yaml diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/serviceaccount.yaml b/versions/ctrlmesh/0.1.0/templates/serviceaccount.yaml similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/templates/serviceaccount.yaml rename to versions/ctrlmesh/0.1.0/templates/serviceaccount.yaml diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/webhook/mutating.yaml b/versions/ctrlmesh/0.1.0/templates/webhook/mutating.yaml similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/templates/webhook/mutating.yaml rename to versions/ctrlmesh/0.1.0/templates/webhook/mutating.yaml diff --git a/versions/ctrlmesh/0.1.0-beta.6/templates/webhook/validating.yaml b/versions/ctrlmesh/0.1.0/templates/webhook/validating.yaml similarity index 100% rename from versions/ctrlmesh/0.1.0-beta.6/templates/webhook/validating.yaml rename to versions/ctrlmesh/0.1.0/templates/webhook/validating.yaml diff --git a/versions/ctrlmesh/0.1.0/values.yaml b/versions/ctrlmesh/0.1.0/values.yaml new file mode 100644 index 0000000..5e25928 --- /dev/null +++ b/versions/ctrlmesh/0.1.0/values.yaml @@ -0,0 +1,51 @@ +# Default values for Controller Mesh. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +namespace: ctrlmesh +namespaceEnabled: true + +manager: + replicas: 2 + image: + repo: kusionstack/ctrlmesh-manager + pullPolicy: IfNotPresent + tag: v0.1.0 + resources: + limits: + cpu: 500m + memory: 512Mi + requests: + cpu: 10m + memory: 64Mi + +proxy: + image: + repo: kusionstack/ctrlmesh-proxy + pullPolicy: IfNotPresent + tag: v0.1.0 + resources: + cpu: 100m + memory: 100Mi + +init: + image: + repo: kusionstack/ctrlmesh-init + tag: v0.1.0 + +shardingGroupVersionKinds: +groupVersionKinds: + ctrlmesh.kusionstack.io/v1alpha1: + - '*' + v1: + - Pod + - PersistentVolumeClaim + - Service + - ConfigMap + - Endpoint + apps/v1: + - StatefulSet + - ReplicaSet + - ControllerRevision + + diff --git a/versions/kafed/0.1.0-beta.0/Chart.yaml b/versions/operating/0.1.0-beta.0/Chart.yaml similarity index 85% rename from versions/kafed/0.1.0-beta.0/Chart.yaml rename to versions/operating/0.1.0-beta.0/Chart.yaml index 9878f29..9d8dff2 100644 --- a/versions/kafed/0.1.0-beta.0/Chart.yaml +++ b/versions/operating/0.1.0-beta.0/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -name: kafed -description: Helm chart for kafed components +name: operating +description: Helm chart for operating components # 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/) @@ -13,4 +13,4 @@ appVersion: 0.1.0-beta.0 home: https://KusionStack.io sources: - - https://github.com/KusionStack/kafed \ No newline at end of file + - https://github.com/KusionStack/operating \ No newline at end of file diff --git a/versions/demo-operator/0.1.1/README.md b/versions/operating/0.1.0-beta.0/README.md similarity index 100% rename from versions/demo-operator/0.1.1/README.md rename to versions/operating/0.1.0-beta.0/README.md diff --git a/versions/kafed/0.1.0-beta.0/templates/NOTES.txt b/versions/operating/0.1.0-beta.0/templates/NOTES.txt similarity index 100% rename from versions/kafed/0.1.0-beta.0/templates/NOTES.txt rename to versions/operating/0.1.0-beta.0/templates/NOTES.txt diff --git a/versions/kafed/0.1.0-beta.0/templates/_helpers.tpl b/versions/operating/0.1.0-beta.0/templates/_helpers.tpl similarity index 100% rename from versions/kafed/0.1.0-beta.0/templates/_helpers.tpl rename to versions/operating/0.1.0-beta.0/templates/_helpers.tpl diff --git a/versions/kafed/0.1.0-beta.0/templates/crd/apps.kusionstack.io_collasets.yaml b/versions/operating/0.1.0-beta.0/templates/crd/apps.kusionstack.io_collasets.yaml similarity index 100% rename from versions/kafed/0.1.0-beta.0/templates/crd/apps.kusionstack.io_collasets.yaml rename to versions/operating/0.1.0-beta.0/templates/crd/apps.kusionstack.io_collasets.yaml diff --git a/versions/kafed/0.1.0-beta.0/templates/crd/apps.kusionstack.io_resourcecontexts.yaml b/versions/operating/0.1.0-beta.0/templates/crd/apps.kusionstack.io_resourcecontexts.yaml similarity index 100% rename from versions/kafed/0.1.0-beta.0/templates/crd/apps.kusionstack.io_resourcecontexts.yaml rename to versions/operating/0.1.0-beta.0/templates/crd/apps.kusionstack.io_resourcecontexts.yaml diff --git a/versions/kafed/0.1.0-beta.0/templates/crd/apps.kusionstack.io_rulesets.yaml b/versions/operating/0.1.0-beta.0/templates/crd/apps.kusionstack.io_rulesets.yaml similarity index 100% rename from versions/kafed/0.1.0-beta.0/templates/crd/apps.kusionstack.io_rulesets.yaml rename to versions/operating/0.1.0-beta.0/templates/crd/apps.kusionstack.io_rulesets.yaml diff --git a/versions/kafed/0.1.0-beta.0/templates/deployment.yaml b/versions/operating/0.1.0-beta.0/templates/deployment.yaml similarity index 100% rename from versions/kafed/0.1.0-beta.0/templates/deployment.yaml rename to versions/operating/0.1.0-beta.0/templates/deployment.yaml diff --git a/versions/kafed/0.1.0-beta.0/templates/namespace.yaml b/versions/operating/0.1.0-beta.0/templates/namespace.yaml similarity index 84% rename from versions/kafed/0.1.0-beta.0/templates/namespace.yaml rename to versions/operating/0.1.0-beta.0/templates/namespace.yaml index 318e27c..43be56f 100644 --- a/versions/kafed/0.1.0-beta.0/templates/namespace.yaml +++ b/versions/operating/0.1.0-beta.0/templates/namespace.yaml @@ -1,4 +1,4 @@ -{{- if .Values.namesapceEnabled -}} +{{- if .Values.namespaceEnabled -}} apiVersion: v1 kind: Namespace metadata: diff --git a/versions/kafed/0.1.0-beta.0/templates/rbac/rbac.yaml b/versions/operating/0.1.0-beta.0/templates/rbac/rbac.yaml similarity index 100% rename from versions/kafed/0.1.0-beta.0/templates/rbac/rbac.yaml rename to versions/operating/0.1.0-beta.0/templates/rbac/rbac.yaml diff --git a/versions/kafed/0.1.0-beta.0/templates/service.yaml b/versions/operating/0.1.0-beta.0/templates/service.yaml similarity index 100% rename from versions/kafed/0.1.0-beta.0/templates/service.yaml rename to versions/operating/0.1.0-beta.0/templates/service.yaml diff --git a/versions/kafed/0.1.0-beta.0/templates/webhook/webhook.yaml b/versions/operating/0.1.0-beta.0/templates/webhook/webhook.yaml similarity index 100% rename from versions/kafed/0.1.0-beta.0/templates/webhook/webhook.yaml rename to versions/operating/0.1.0-beta.0/templates/webhook/webhook.yaml diff --git a/versions/kafed/0.1.0-beta.0/values.yaml b/versions/operating/0.1.0-beta.0/values.yaml similarity index 66% rename from versions/kafed/0.1.0-beta.0/values.yaml rename to versions/operating/0.1.0-beta.0/values.yaml index 24125da..8eb02b5 100644 --- a/versions/kafed/0.1.0-beta.0/values.yaml +++ b/versions/operating/0.1.0-beta.0/values.yaml @@ -2,16 +2,16 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -replicaCount: 3 +managerReplicas: 3 -project: kafed +project: operating namespace: kusionstack-system -namesapceEnabled: true +namespaceEnabled: true -controlPlane: kusionstack-kafed +controlPlane: kusionstack-operating imageTag: v0.1.0-beta.0 -imageRepo: kusionstack/kafed +imageRepo: kusionstack/operating imagePullPolicy: IfNotPresent managerReplicas: 3 @@ -24,7 +24,7 @@ resources: memory: 64Mi commonLabels: - app.kubernetes.io/part-of: kafed + app.kubernetes.io/part-of: operating diff --git a/versions/demo-operator/0.1.1/Chart.yaml b/versions/sample-operator/0.1.1/Chart.yaml similarity index 84% rename from versions/demo-operator/0.1.1/Chart.yaml rename to versions/sample-operator/0.1.1/Chart.yaml index 73c622f..219bc83 100644 --- a/versions/demo-operator/0.1.1/Chart.yaml +++ b/versions/sample-operator/0.1.1/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -name: demo-operator -description: Helm chart for demo operator +name: sample-operator +description: Helm chart for sample operator # 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/) @@ -13,4 +13,4 @@ appVersion: 0.1.1 namespace: ctrlmesh home: https://KusionStack.io #sources: -# - https://github.com/KusionStack/demo-operator \ No newline at end of file +# - https://github.com/KusionStack/sample-operator \ No newline at end of file diff --git a/versions/kafed/0.1.0-beta.0/README.md b/versions/sample-operator/0.1.1/README.md similarity index 100% rename from versions/kafed/0.1.0-beta.0/README.md rename to versions/sample-operator/0.1.1/README.md diff --git a/versions/demo-operator/0.1.1/templates/NOTES.txt b/versions/sample-operator/0.1.1/templates/NOTES.txt similarity index 100% rename from versions/demo-operator/0.1.1/templates/NOTES.txt rename to versions/sample-operator/0.1.1/templates/NOTES.txt diff --git a/versions/demo-operator/0.1.1/templates/configmap.yaml b/versions/sample-operator/0.1.1/templates/configmap.yaml similarity index 79% rename from versions/demo-operator/0.1.1/templates/configmap.yaml rename to versions/sample-operator/0.1.1/templates/configmap.yaml index 6d284ae..c1778a6 100644 --- a/versions/demo-operator/0.1.1/templates/configmap.yaml +++ b/versions/sample-operator/0.1.1/templates/configmap.yaml @@ -119,4 +119,36 @@ metadata: namespace: demo-0v labels: control-by: demo +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: demo + namespace: demo-0w + labels: + control-by: demo +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: demo + namespace: demo-0x + labels: + control-by: demo +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: demo + namespace: demo-0y + labels: + control-by: demo +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: demo + namespace: demo-0z + labels: + control-by: demo {{- end }} \ No newline at end of file diff --git a/versions/demo-operator/0.1.1/templates/namesapce.yaml b/versions/sample-operator/0.1.1/templates/namesapce.yaml similarity index 79% rename from versions/demo-operator/0.1.1/templates/namesapce.yaml rename to versions/sample-operator/0.1.1/templates/namesapce.yaml index 0de8340..e5448a3 100644 --- a/versions/demo-operator/0.1.1/templates/namesapce.yaml +++ b/versions/sample-operator/0.1.1/templates/namesapce.yaml @@ -74,4 +74,24 @@ apiVersion: v1 kind: Namespace metadata: name: demo-0v +--- +apiVersion: v1 +kind: Namespace +metadata: + name: demo-0w +--- +apiVersion: v1 +kind: Namespace +metadata: + name: demo-0x +--- +apiVersion: v1 +kind: Namespace +metadata: + name: demo-0y +--- +apiVersion: v1 +kind: Namespace +metadata: + name: demo-0z {{- end }} \ No newline at end of file diff --git a/versions/demo-operator/0.1.1/templates/rbac.yaml b/versions/sample-operator/0.1.1/templates/rbac.yaml similarity index 77% rename from versions/demo-operator/0.1.1/templates/rbac.yaml rename to versions/sample-operator/0.1.1/templates/rbac.yaml index ccf3a5c..8033bd2 100644 --- a/versions/demo-operator/0.1.1/templates/rbac.yaml +++ b/versions/sample-operator/0.1.1/templates/rbac.yaml @@ -3,14 +3,14 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: demo-operator-serviceaccount + name: sample-operator-serviceaccount namespace: {{ .Values.namespace }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: creationTimestamp: null - name: demo-operator-role + name: sample-operator-role rules: - apiGroups: - '*' @@ -36,17 +36,17 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: demo-operator-binding + name: sample-operator-binding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: demo-operator-role + name: sample-operator-role subjects: - kind: ServiceAccount - name: demo-operator-serviceaccount + name: sample-operator-serviceaccount namespace: {{ .Values.namespace }} --- -{{- if .Values.namesapceEnabled -}} +{{- if .Values.namespaceEnabled -}} apiVersion: v1 kind: Namespace metadata: diff --git a/versions/demo-operator/0.1.1/templates/shardingconfig.yaml b/versions/sample-operator/0.1.1/templates/shardingconfig.yaml similarity index 90% rename from versions/demo-operator/0.1.1/templates/shardingconfig.yaml rename to versions/sample-operator/0.1.1/templates/shardingconfig.yaml index 938ca91..571957a 100644 --- a/versions/demo-operator/0.1.1/templates/shardingconfig.yaml +++ b/versions/sample-operator/0.1.1/templates/shardingconfig.yaml @@ -6,8 +6,8 @@ metadata: namespace: {{ .Values.namespace }} spec: root: - prefix: operator-demo - targetStatefulSet: demo-operator + prefix: sample-demo + targetStatefulSet: sample-operator canary: replicas: 1 inNamespaces: diff --git a/versions/demo-operator/0.1.1/templates/statefulset.yaml b/versions/sample-operator/0.1.1/templates/statefulset.yaml similarity index 80% rename from versions/demo-operator/0.1.1/templates/statefulset.yaml rename to versions/sample-operator/0.1.1/templates/statefulset.yaml index 84ab4c4..4256e99 100644 --- a/versions/demo-operator/0.1.1/templates/statefulset.yaml +++ b/versions/sample-operator/0.1.1/templates/statefulset.yaml @@ -2,20 +2,20 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - name: demo-operator + name: sample-operator namespace: {{ .Values.namespace }} spec: - replicas: {{ .Values.replicaCount }} + replicas: {{ .Values.managerReplicas }} revisionHistoryLimit: 10 selector: matchLabels: - control-plane: demo-operator + control-plane: sample-operator updateStrategy: type: OnDelete template: metadata: labels: - control-plane: demo-operator + control-plane: sample-operator ctrlmesh.kusionstack.io/watching: 'true' {{- if .Values.sharding.enable}} ctrlmesh.kusionstack.io/enable-proxy: 'true' @@ -35,7 +35,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.name - name: demo-operator + name: sample-operator image: {{ .Values.image }} imagePullPolicy: IfNotPresent resources: @@ -45,5 +45,5 @@ spec: terminationMessagePath: /dev/termination-log terminationMessagePolicy: File dnsPolicy: ClusterFirst - serviceAccount: demo-operator-serviceaccount - serviceAccountName: demo-operator-serviceaccount \ No newline at end of file + serviceAccount: sample-operator-serviceaccount + serviceAccountName: sample-operator-serviceaccount \ No newline at end of file diff --git a/versions/demo-operator/0.1.1/values.yaml b/versions/sample-operator/0.1.1/values.yaml similarity index 89% rename from versions/demo-operator/0.1.1/values.yaml rename to versions/sample-operator/0.1.1/values.yaml index cabfc6b..de39d6a 100644 --- a/versions/demo-operator/0.1.1/values.yaml +++ b/versions/sample-operator/0.1.1/values.yaml @@ -2,10 +2,10 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -replicaCount: 5 +managerReplicas: 5 namespace: ctrlmesh -namesapceEnabled: false +namespaceEnabled: false demoNsEnabled: true demoCmEnabled: true