Skip to content

Commit

Permalink
Merge pull request #5 from KusionStack/230911-ctrlmesh
Browse files Browse the repository at this point in the history
ctrlmesh release beta.6
  • Loading branch information
Eikykun authored Sep 18, 2023
2 parents 2cd7654 + 5834387 commit fbde718
Show file tree
Hide file tree
Showing 68 changed files with 114 additions and 1,845 deletions.
1 change: 1 addition & 0 deletions charts/ctrlmesh
1 change: 1 addition & 0 deletions charts/demo-operator
1 change: 0 additions & 1 deletion charts/kridge

This file was deleted.

1 change: 0 additions & 1 deletion charts/kridge-demo-operator

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
apiVersion: v1
name: kridge
description: Helm chart for kridge components
name: ctrlmesh
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.3
version: 0.1.0-beta.6
# 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.3
appVersion: 0.1.0-beta.6

home: https://KusionStack.io
sources:
- https://github.com/KusionStack/kridge
- https://github.com/KusionStack/controllermesh
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ data:
{{- toYaml .Values.shardingGroupVersionKinds | nindent 4 }}
kind: ConfigMap
metadata:
name: kridge-sharding-resource
name: ctrlmesh-sharding-resource
namespace: {{ .Values.namespace }}
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: circuitbreakers.kridge.kusionstack.io
name: circuitbreakers.ctrlmesh.kusionstack.io
spec:
group: kridge.kusionstack.io
group: ctrlmesh.kusionstack.io
names:
kind: CircuitBreaker
listKind: CircuitBreakerList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: managerstates.kridge.kusionstack.io
name: managerstates.ctrlmesh.kusionstack.io
spec:
group: kridge.kusionstack.io
group: ctrlmesh.kusionstack.io
names:
kind: ManagerState
listKind: ManagerStateList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
name: shardingconfigs.kridge.kusionstack.io
name: shardingconfigs.ctrlmesh.kusionstack.io
spec:
group: kridge.kusionstack.io
group: ctrlmesh.kusionstack.io
names:
kind: ShardingConfig
listKind: ShardingConfigList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
kridge.kusionstack.io/ignore-webhook: 'true'
name: kridge
ctrlmesh.kusionstack.io/ignore-webhook: 'true'
name: ctrlmesh
namespace: {{ .Values.namespace }}
spec:
replicas: {{ .Values.replicaCount }}
revisionHistoryLimit: 10
selector:
matchLabels:
control-plane: kridge
control-plane: ctrlmesh
strategy:
rollingUpdate:
maxSurge: 1
Expand All @@ -19,9 +19,9 @@ spec:
template:
metadata:
labels:
control-plane: kridge
kridge.kusionstack.io/ignore-webhook: 'true'
kridge.kusionstack.io/watching: 'true'
control-plane: ctrlmesh
ctrlmesh.kusionstack.io/ignore-webhook: 'true'
ctrlmesh.kusionstack.io/watching: 'true'
spec:
containers:
- args:
Expand All @@ -34,7 +34,7 @@ spec:
- --proxy-ephemeral-storage={{ .Values.proxyResources.ephemeralStorage }}
- --proxy-image-pull-policy={{ .Values.proxyImage.pullPolicy }}
command:
- /kridge-manager
- /ctrlmesh-manager
env:
- name: POD_NAMESPACE
valueFrom:
Expand Down Expand Up @@ -82,5 +82,5 @@ spec:
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
dnsPolicy: ClusterFirst
serviceAccount: kridge-serviceaccount
serviceAccountName: kridge-serviceaccount
serviceAccount: ctrlmesh-serviceaccount
serviceAccountName: ctrlmesh-serviceaccount
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: kridge-leader-election-rolebinding
name: ctrlmesh-leader-election-rolebinding
namespace: {{ .Values.namespace }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: leader-election-role
subjects:
- kind: ServiceAccount
name: kridge-serviceaccount
name: ctrlmesh-serviceaccount
namespace: {{ .Values.namespace }}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: managerstate-editor-role
rules:
- apiGroups:
- kridge.kusionstack.io
- ctrlmesh.kusionstack.io
resources:
- managerstates
verbs:
Expand All @@ -17,7 +17,7 @@ rules:
- update
- watch
- apiGroups:
- kridge.kusionstack.io
- ctrlmesh.kusionstack.io
resources:
- managerstates/status
verbs:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ metadata:
name: managerstate-viewer-role
rules:
- apiGroups:
- kridge.kusionstack.io
- ctrlmesh.kusionstack.io
resources:
- managerstates
verbs:
- get
- list
- watch
- apiGroups:
- kridge.kusionstack.io
- ctrlmesh.kusionstack.io
resources:
- managerstates/status
verbs:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: kridge-public-role
name: ctrlmesh-public-role
rules:
- apiGroups:
- kridge.kusionstack.io
- ctrlmesh.kusionstack.io
resources:
- managerstates
- trafficpolicies
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: kridge-public-rolebinding
name: ctrlmesh-public-rolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: kridge-public-role
name: ctrlmesh-public-role
subjects:
- apiGroup: rbac.authorization.k8s.io
kind: Group
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: kridge-kusionstack-role
name: ctrlmesh-kusionstack-role
rules:
- apiGroups:
- '*'
Expand Down Expand Up @@ -67,7 +67,7 @@ rules:
- update
- watch
- apiGroups:
- kridge.kusionstack.io
- ctrlmesh.kusionstack.io
resources:
- managerstates
- managerstates/finalizers
Expand All @@ -80,7 +80,7 @@ rules:
- update
- watch
- apiGroups:
- kridge.kusionstack.io
- ctrlmesh.kusionstack.io
resources:
- '*'
- '*/status'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: kridge-rolebinding
name: ctrlmesh-rolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: kridge-kusionstack-role
name: ctrlmesh-kusionstack-role
subjects:
- kind: ServiceAccount
name: kridge-serviceaccount
name: ctrlmesh-serviceaccount
namespace: {{ .Values.namespace }}
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ apiVersion: v1
kind: Service
metadata:
labels:
kridge.kusionstack.io/ignore-webhook: "true"
name: kridge-webhook-service
ctrlmesh.kusionstack.io/ignore-webhook: "true"
name: ctrlmesh-webhook-service
namespace: {{ .Values.namespace }}
spec:
ports:
- port: 443
protocol: TCP
targetPort: 9443
selector:
control-plane: kridge
control-plane: ctrlmesh
type: NodePort
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: kridge-serviceaccount
name: ctrlmesh-serviceaccount
namespace: {{ .Values.namespace }}
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
apiVersion: admissionregistration.k8s.io/v1
kind: MutatingWebhookConfiguration
metadata:
name: kridge-mutating
name: ctrlmesh-mutating
webhooks:
- admissionReviewVersions:
- v1
- v1beta1
clientConfig:
service:
name: kridge-webhook-service
name: ctrlmesh-webhook-service
namespace: {{ .Values.namespace }}
path: /mutate-namespace
port: 443
failurePolicy: Ignore
name: namesapace.kridge.mutating.io
name: namesapace.ctrlmesh.mutating.io
rules:
- apiGroups:
- ""
Expand All @@ -30,12 +30,12 @@ webhooks:
- v1beta1
clientConfig:
service:
name: kridge-webhook-service
name: ctrlmesh-webhook-service
namespace: {{ .Values.namespace }}
path: /mutate-pod
port: 443
failurePolicy: Ignore
name: pod.kridge.mutating.io
name: pod.ctrlmesh.mutating.io
rules:
- apiGroups:
- ""
Expand All @@ -51,12 +51,12 @@ webhooks:
- v1beta1
clientConfig:
service:
name: kridge-webhook-service
name: ctrlmesh-webhook-service
namespace: {{ .Values.namespace }}
path: /mutate-resource
port: 443
failurePolicy: Ignore
name: resource.kridge.mutating.io
name: resource.ctrlmesh.mutating.io
rules:
- apiGroups:
- ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration
metadata:
name: kridge-validating
name: ctrlmesh-validating
webhooks:
- admissionReviewVersions:
- v1
- v1beta1
clientConfig:
service:
name: kridge-webhook-service
name: ctrlmesh-webhook-service
namespace: {{ .Values.namespace }}
path: /validate-kridge-shardingconfig
path: /validate-ctrlmesh-shardingconfig
port: 443
failurePolicy: Fail
name: shardingconfigs.kridge.validating.io
name: shardingconfigs.ctrlmesh.validating.io
rules:
- apiGroups:
- kridge.kusionstack.io
- ctrlmesh.kusionstack.io
apiVersions:
- v1alpha1
operations:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# Default values for mykridge.
# Default values for Controller Mesh.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.

replicaCount: 2

namespace: kridge
namespace: ctrlmesh
namesapceEnabled: true

imageTag: v0.1.0-beta.3
imageTag: v0.1.0-beta.6
proxyImage:
repository: kusionstack/kridge-proxy
repository: kusionstack/ctrlmesh-proxy
pullPolicy: IfNotPresent

managerImage:
repository: kusionstack/kridge-manager
repository: kusionstack/ctrlmesh-manager
pullPolicy: IfNotPresent

initImage: kusionstack/kridge-init
initImage: kusionstack/ctrlmesh-init

managerResources:
limits:
Expand All @@ -33,7 +33,7 @@ proxyResources:

shardingGroupVersionKinds:
groupVersionKinds:
kridge.kusionstack.io/v1alpha1:
ctrlmesh.kusionstack.io/v1alpha1:
- '*'
v1:
- Pod
Expand Down
Loading

0 comments on commit fbde718

Please sign in to comment.