Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename kafed -> operating, bump ctrlmesh to v0.1.0 #6

Merged
merged 1 commit into from
Sep 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/ctrlmesh
1 change: 0 additions & 1 deletion charts/demo-operator

This file was deleted.

1 change: 0 additions & 1 deletion charts/kafed

This file was deleted.

1 change: 1 addition & 0 deletions charts/operating
1 change: 1 addition & 0 deletions charts/sample-operator
49 changes: 0 additions & 49 deletions versions/ctrlmesh/0.1.0-beta.6/values.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: ctrlmesh
namespace: {{ .Values.namespace }}
spec:
replicas: {{ .Values.replicaCount }}
replicas: {{ .Values.manager.replicas }}
revisionHistoryLimit: 10
selector:
matchLabels:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if .Values.namesapceEnabled -}}
{{- if .Values.namespaceEnabled -}}
apiVersion: v1
kind: Namespace
metadata:
Expand Down
51 changes: 51 additions & 0 deletions versions/ctrlmesh/0.1.0/values.yaml
Original file line number Diff line number Diff line change
@@ -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


Original file line number Diff line number Diff line change
@@ -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/)
Expand All @@ -13,4 +13,4 @@ appVersion: 0.1.0-beta.0

home: https://KusionStack.io
sources:
- https://github.com/KusionStack/kafed
- https://github.com/KusionStack/operating
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if .Values.namesapceEnabled -}}
{{- if .Values.namespaceEnabled -}}
apiVersion: v1
kind: Namespace
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -24,7 +24,7 @@ resources:
memory: 64Mi

commonLabels:
app.kubernetes.io/part-of: kafed
app.kubernetes.io/part-of: operating



Expand Down
Original file line number Diff line number Diff line change
@@ -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/)
Expand All @@ -13,4 +13,4 @@ appVersion: 0.1.1
namespace: ctrlmesh
home: https://KusionStack.io
#sources:
# - https://github.com/KusionStack/demo-operator
# - https://github.com/KusionStack/sample-operator
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- '*'
Expand All @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading