From 8b4803f8cc917b5d76e246183a71b43d52271a4c Mon Sep 17 00:00:00 2001 From: Ai Ranthem Date: Mon, 12 May 2025 14:48:47 +0800 Subject: [PATCH] Chore: reformat rollout chart (#140) * reformat rollout webhookconfiguration.yaml Signed-off-by: AiRanthem * reformat rollout webhookconfiguration.yaml Signed-off-by: AiRanthem --------- Signed-off-by: AiRanthem --- .../0.3/templates/webhookconfiguration.yaml | 1 - .../0.6.0/templates/webhookconfiguration.yaml | 395 +++++++++--------- .../0.6.1/templates/webhookconfiguration.yaml | 395 +++++++++--------- 3 files changed, 394 insertions(+), 397 deletions(-) diff --git a/versions/kruise-rollout/0.3/templates/webhookconfiguration.yaml b/versions/kruise-rollout/0.3/templates/webhookconfiguration.yaml index e952a97..030fe04 100644 --- a/versions/kruise-rollout/0.3/templates/webhookconfiguration.yaml +++ b/versions/kruise-rollout/0.3/templates/webhookconfiguration.yaml @@ -1,4 +1,3 @@ - --- apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration diff --git a/versions/kruise-rollout/0.6.0/templates/webhookconfiguration.yaml b/versions/kruise-rollout/0.6.0/templates/webhookconfiguration.yaml index fe6004a..7daeead 100644 --- a/versions/kruise-rollout/0.6.0/templates/webhookconfiguration.yaml +++ b/versions/kruise-rollout/0.6.0/templates/webhookconfiguration.yaml @@ -1,233 +1,232 @@ - --- apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: name: kruise-rollout-mutating-webhook-configuration webhooks: -- admissionReviewVersions: - - v1 - - v1beta1 - clientConfig: - service: - name: kruise-rollout-webhook-service - namespace: {{ .Values.installation.namespace }} - path: /mutate-unified-workload - failurePolicy: Fail - name: munifiedworload.kb.io - objectSelector: - matchExpressions: - - key: rollouts.kruise.io/workload-type - operator: Exists + - admissionReviewVersions: + - v1 + - v1beta1 + clientConfig: + service: + name: kruise-rollout-webhook-service + namespace: {{ .Values.installation.namespace }} + path: /mutate-unified-workload + failurePolicy: Fail + name: munifiedworload.kb.io + objectSelector: + matchExpressions: + - key: rollouts.kruise.io/workload-type + operator: Exists {{- if .Values.rollout.webhook.objectSelector }} {{- range $label := .Values.rollout.webhook.objectSelector }} - - key: {{ $label.key }} - operator: {{ $label.operator }} + - key: {{ $label.key }} + operator: {{ $label.operator }} {{- if $label.values}} - values: + values: {{- range $value := $label.values }} - - {{ $value }} + - {{ $value }} {{- end }} {{- end}} {{- end }} {{- end }} - rules: - - apiGroups: - - '*' - apiVersions: - - '*' - operations: - - CREATE - - UPDATE - resources: - - '*' - sideEffects: None -- admissionReviewVersions: - - v1 - - v1beta1 - clientConfig: - service: - name: kruise-rollout-webhook-service - namespace: {{ .Values.installation.namespace }} - path: /mutate-apps-v1-deployment - failurePolicy: Fail - name: mdeployment.kb.io - objectSelector: - matchExpressions: - - key: control-plane - operator: NotIn - values: - - {{ .Values.rollout.fullname }} - - key: rollouts.kruise.io/workload-type - operator: Exists + rules: + - apiGroups: + - '*' + apiVersions: + - '*' + operations: + - CREATE + - UPDATE + resources: + - '*' + sideEffects: None + - admissionReviewVersions: + - v1 + - v1beta1 + clientConfig: + service: + name: kruise-rollout-webhook-service + namespace: {{ .Values.installation.namespace }} + path: /mutate-apps-v1-deployment + failurePolicy: Fail + name: mdeployment.kb.io + objectSelector: + matchExpressions: + - key: control-plane + operator: NotIn + values: + - {{ .Values.rollout.fullname }} + - key: rollouts.kruise.io/workload-type + operator: Exists {{- if .Values.rollout.webhook.objectSelector }} {{- range $label := .Values.rollout.webhook.objectSelector }} - - key: {{ $label.key }} - operator: {{ $label.operator }} + - key: {{ $label.key }} + operator: {{ $label.operator }} {{- if $label.values}} - values: + values: {{- range $value := $label.values }} - - {{ $value }} + - {{ $value }} {{- end }} {{- end}} {{- end }} {{- end }} - rules: - - apiGroups: - - apps - apiVersions: - - v1 - operations: - - UPDATE - resources: - - deployments - sideEffects: None -- admissionReviewVersions: - - v1 - - v1beta1 - clientConfig: - service: - name: kruise-rollout-webhook-service - namespace: {{ .Values.installation.namespace }} - path: /mutate-apps-kruise-io-v1alpha1-cloneset - failurePolicy: Fail - name: mcloneset.kb.io - objectSelector: - matchExpressions: - - key: rollouts.kruise.io/workload-type - operator: Exists + rules: + - apiGroups: + - apps + apiVersions: + - v1 + operations: + - UPDATE + resources: + - deployments + sideEffects: None + - admissionReviewVersions: + - v1 + - v1beta1 + clientConfig: + service: + name: kruise-rollout-webhook-service + namespace: {{ .Values.installation.namespace }} + path: /mutate-apps-kruise-io-v1alpha1-cloneset + failurePolicy: Fail + name: mcloneset.kb.io + objectSelector: + matchExpressions: + - key: rollouts.kruise.io/workload-type + operator: Exists {{- if .Values.rollout.webhook.objectSelector }} {{- range $label := .Values.rollout.webhook.objectSelector }} - - key: {{ $label.key }} - operator: {{ $label.operator }} + - key: {{ $label.key }} + operator: {{ $label.operator }} {{- if $label.values}} - values: + values: {{- range $value := $label.values }} - - {{ $value }} + - {{ $value }} {{- end }} {{- end}} {{- end }} {{- end }} - rules: - - apiGroups: - - apps.kruise.io - apiVersions: - - v1alpha1 - operations: - - UPDATE - resources: - - clonesets - sideEffects: None -- admissionReviewVersions: - - v1 - - v1beta1 - clientConfig: - service: - name: kruise-rollout-webhook-service - namespace: {{ .Values.installation.namespace }} - path: /mutate-apps-v1-statefulset - failurePolicy: Fail - name: mstatefulset.kb.io - objectSelector: - matchExpressions: - - key: rollouts.kruise.io/workload-type - operator: Exists + rules: + - apiGroups: + - apps.kruise.io + apiVersions: + - v1alpha1 + operations: + - UPDATE + resources: + - clonesets + sideEffects: None + - admissionReviewVersions: + - v1 + - v1beta1 + clientConfig: + service: + name: kruise-rollout-webhook-service + namespace: {{ .Values.installation.namespace }} + path: /mutate-apps-v1-statefulset + failurePolicy: Fail + name: mstatefulset.kb.io + objectSelector: + matchExpressions: + - key: rollouts.kruise.io/workload-type + operator: Exists {{- if .Values.rollout.webhook.objectSelector }} {{- range $label := .Values.rollout.webhook.objectSelector }} - - key: {{ $label.key }} - operator: {{ $label.operator }} + - key: {{ $label.key }} + operator: {{ $label.operator }} {{- if $label.values}} - values: + values: {{- range $value := $label.values }} - - {{ $value }} + - {{ $value }} {{- end }} {{- end}} {{- end }} {{- end }} - rules: - - apiGroups: - - apps - apiVersions: - - v1 - operations: - - UPDATE - resources: - - statefulsets - sideEffects: None -- admissionReviewVersions: - - v1 - - v1beta1 - clientConfig: - service: - name: kruise-rollout-webhook-service - namespace: {{ .Values.installation.namespace }} - path: /mutate-apps-kruise-io-statefulset - failurePolicy: Fail - name: madvancedstatefulset.kb.io - objectSelector: - matchExpressions: - - key: rollouts.kruise.io/workload-type - operator: Exists + rules: + - apiGroups: + - apps + apiVersions: + - v1 + operations: + - UPDATE + resources: + - statefulsets + sideEffects: None + - admissionReviewVersions: + - v1 + - v1beta1 + clientConfig: + service: + name: kruise-rollout-webhook-service + namespace: {{ .Values.installation.namespace }} + path: /mutate-apps-kruise-io-statefulset + failurePolicy: Fail + name: madvancedstatefulset.kb.io + objectSelector: + matchExpressions: + - key: rollouts.kruise.io/workload-type + operator: Exists {{- if .Values.rollout.webhook.objectSelector }} {{- range $label := .Values.rollout.webhook.objectSelector }} - - key: {{ $label.key }} - operator: {{ $label.operator }} + - key: {{ $label.key }} + operator: {{ $label.operator }} {{- if $label.values}} - values: + values: {{- range $value := $label.values }} - - {{ $value }} + - {{ $value }} {{- end }} {{- end}} {{- end }} {{- end }} - rules: - - apiGroups: - - apps.kruise.io - apiVersions: - - v1alpha1 - - v1beta1 - operations: - - CREATE - - UPDATE - resources: - - statefulsets - sideEffects: None -- admissionReviewVersions: - - v1 - - v1beta1 - clientConfig: - service: - name: kruise-rollout-webhook-service - namespace: {{ .Values.installation.namespace }} - path: /mutate-apps-kruise-io-v1alpha1-daemonset - failurePolicy: Fail - name: mdaemonset.kb.io - objectSelector: - matchExpressions: - - key: rollouts.kruise.io/workload-type - operator: Exists + rules: + - apiGroups: + - apps.kruise.io + apiVersions: + - v1alpha1 + - v1beta1 + operations: + - CREATE + - UPDATE + resources: + - statefulsets + sideEffects: None + - admissionReviewVersions: + - v1 + - v1beta1 + clientConfig: + service: + name: kruise-rollout-webhook-service + namespace: {{ .Values.installation.namespace }} + path: /mutate-apps-kruise-io-v1alpha1-daemonset + failurePolicy: Fail + name: mdaemonset.kb.io + objectSelector: + matchExpressions: + - key: rollouts.kruise.io/workload-type + operator: Exists {{- if .Values.rollout.webhook.objectSelector }} {{- range $label := .Values.rollout.webhook.objectSelector }} - - key: {{ $label.key }} - operator: {{ $label.operator }} + - key: {{ $label.key }} + operator: {{ $label.operator }} {{- if $label.values }} - values: + values: {{- range $value := $label.values }} - - {{ $value }} + - {{ $value }} {{- end }} {{- end }} {{- end }} {{- end }} - rules: - - apiGroups: - - apps.kruise.io - apiVersions: - - v1alpha1 - operations: - - UPDATE - resources: - - daemonsets - sideEffects: None + rules: + - apiGroups: + - apps.kruise.io + apiVersions: + - v1alpha1 + operations: + - UPDATE + resources: + - daemonsets + sideEffects: None --- apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration @@ -235,25 +234,25 @@ metadata: creationTimestamp: null name: kruise-rollout-validating-webhook-configuration webhooks: -- admissionReviewVersions: - - v1 - - v1beta1 - clientConfig: - service: - name: kruise-rollout-webhook-service - namespace: {{ .Values.installation.namespace }} - path: /validate-rollouts-kruise-io-rollout - failurePolicy: Fail - name: vrollout.kb.io - rules: - - apiGroups: - - rollouts.kruise.io - apiVersions: - - v1alpha1 - - v1beta1 - operations: - - CREATE - - UPDATE - resources: - - rollouts - sideEffects: None + - admissionReviewVersions: + - v1 + - v1beta1 + clientConfig: + service: + name: kruise-rollout-webhook-service + namespace: {{ .Values.installation.namespace }} + path: /validate-rollouts-kruise-io-rollout + failurePolicy: Fail + name: vrollout.kb.io + rules: + - apiGroups: + - rollouts.kruise.io + apiVersions: + - v1alpha1 + - v1beta1 + operations: + - CREATE + - UPDATE + resources: + - rollouts + sideEffects: None diff --git a/versions/kruise-rollout/0.6.1/templates/webhookconfiguration.yaml b/versions/kruise-rollout/0.6.1/templates/webhookconfiguration.yaml index fe6004a..7daeead 100644 --- a/versions/kruise-rollout/0.6.1/templates/webhookconfiguration.yaml +++ b/versions/kruise-rollout/0.6.1/templates/webhookconfiguration.yaml @@ -1,233 +1,232 @@ - --- apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: name: kruise-rollout-mutating-webhook-configuration webhooks: -- admissionReviewVersions: - - v1 - - v1beta1 - clientConfig: - service: - name: kruise-rollout-webhook-service - namespace: {{ .Values.installation.namespace }} - path: /mutate-unified-workload - failurePolicy: Fail - name: munifiedworload.kb.io - objectSelector: - matchExpressions: - - key: rollouts.kruise.io/workload-type - operator: Exists + - admissionReviewVersions: + - v1 + - v1beta1 + clientConfig: + service: + name: kruise-rollout-webhook-service + namespace: {{ .Values.installation.namespace }} + path: /mutate-unified-workload + failurePolicy: Fail + name: munifiedworload.kb.io + objectSelector: + matchExpressions: + - key: rollouts.kruise.io/workload-type + operator: Exists {{- if .Values.rollout.webhook.objectSelector }} {{- range $label := .Values.rollout.webhook.objectSelector }} - - key: {{ $label.key }} - operator: {{ $label.operator }} + - key: {{ $label.key }} + operator: {{ $label.operator }} {{- if $label.values}} - values: + values: {{- range $value := $label.values }} - - {{ $value }} + - {{ $value }} {{- end }} {{- end}} {{- end }} {{- end }} - rules: - - apiGroups: - - '*' - apiVersions: - - '*' - operations: - - CREATE - - UPDATE - resources: - - '*' - sideEffects: None -- admissionReviewVersions: - - v1 - - v1beta1 - clientConfig: - service: - name: kruise-rollout-webhook-service - namespace: {{ .Values.installation.namespace }} - path: /mutate-apps-v1-deployment - failurePolicy: Fail - name: mdeployment.kb.io - objectSelector: - matchExpressions: - - key: control-plane - operator: NotIn - values: - - {{ .Values.rollout.fullname }} - - key: rollouts.kruise.io/workload-type - operator: Exists + rules: + - apiGroups: + - '*' + apiVersions: + - '*' + operations: + - CREATE + - UPDATE + resources: + - '*' + sideEffects: None + - admissionReviewVersions: + - v1 + - v1beta1 + clientConfig: + service: + name: kruise-rollout-webhook-service + namespace: {{ .Values.installation.namespace }} + path: /mutate-apps-v1-deployment + failurePolicy: Fail + name: mdeployment.kb.io + objectSelector: + matchExpressions: + - key: control-plane + operator: NotIn + values: + - {{ .Values.rollout.fullname }} + - key: rollouts.kruise.io/workload-type + operator: Exists {{- if .Values.rollout.webhook.objectSelector }} {{- range $label := .Values.rollout.webhook.objectSelector }} - - key: {{ $label.key }} - operator: {{ $label.operator }} + - key: {{ $label.key }} + operator: {{ $label.operator }} {{- if $label.values}} - values: + values: {{- range $value := $label.values }} - - {{ $value }} + - {{ $value }} {{- end }} {{- end}} {{- end }} {{- end }} - rules: - - apiGroups: - - apps - apiVersions: - - v1 - operations: - - UPDATE - resources: - - deployments - sideEffects: None -- admissionReviewVersions: - - v1 - - v1beta1 - clientConfig: - service: - name: kruise-rollout-webhook-service - namespace: {{ .Values.installation.namespace }} - path: /mutate-apps-kruise-io-v1alpha1-cloneset - failurePolicy: Fail - name: mcloneset.kb.io - objectSelector: - matchExpressions: - - key: rollouts.kruise.io/workload-type - operator: Exists + rules: + - apiGroups: + - apps + apiVersions: + - v1 + operations: + - UPDATE + resources: + - deployments + sideEffects: None + - admissionReviewVersions: + - v1 + - v1beta1 + clientConfig: + service: + name: kruise-rollout-webhook-service + namespace: {{ .Values.installation.namespace }} + path: /mutate-apps-kruise-io-v1alpha1-cloneset + failurePolicy: Fail + name: mcloneset.kb.io + objectSelector: + matchExpressions: + - key: rollouts.kruise.io/workload-type + operator: Exists {{- if .Values.rollout.webhook.objectSelector }} {{- range $label := .Values.rollout.webhook.objectSelector }} - - key: {{ $label.key }} - operator: {{ $label.operator }} + - key: {{ $label.key }} + operator: {{ $label.operator }} {{- if $label.values}} - values: + values: {{- range $value := $label.values }} - - {{ $value }} + - {{ $value }} {{- end }} {{- end}} {{- end }} {{- end }} - rules: - - apiGroups: - - apps.kruise.io - apiVersions: - - v1alpha1 - operations: - - UPDATE - resources: - - clonesets - sideEffects: None -- admissionReviewVersions: - - v1 - - v1beta1 - clientConfig: - service: - name: kruise-rollout-webhook-service - namespace: {{ .Values.installation.namespace }} - path: /mutate-apps-v1-statefulset - failurePolicy: Fail - name: mstatefulset.kb.io - objectSelector: - matchExpressions: - - key: rollouts.kruise.io/workload-type - operator: Exists + rules: + - apiGroups: + - apps.kruise.io + apiVersions: + - v1alpha1 + operations: + - UPDATE + resources: + - clonesets + sideEffects: None + - admissionReviewVersions: + - v1 + - v1beta1 + clientConfig: + service: + name: kruise-rollout-webhook-service + namespace: {{ .Values.installation.namespace }} + path: /mutate-apps-v1-statefulset + failurePolicy: Fail + name: mstatefulset.kb.io + objectSelector: + matchExpressions: + - key: rollouts.kruise.io/workload-type + operator: Exists {{- if .Values.rollout.webhook.objectSelector }} {{- range $label := .Values.rollout.webhook.objectSelector }} - - key: {{ $label.key }} - operator: {{ $label.operator }} + - key: {{ $label.key }} + operator: {{ $label.operator }} {{- if $label.values}} - values: + values: {{- range $value := $label.values }} - - {{ $value }} + - {{ $value }} {{- end }} {{- end}} {{- end }} {{- end }} - rules: - - apiGroups: - - apps - apiVersions: - - v1 - operations: - - UPDATE - resources: - - statefulsets - sideEffects: None -- admissionReviewVersions: - - v1 - - v1beta1 - clientConfig: - service: - name: kruise-rollout-webhook-service - namespace: {{ .Values.installation.namespace }} - path: /mutate-apps-kruise-io-statefulset - failurePolicy: Fail - name: madvancedstatefulset.kb.io - objectSelector: - matchExpressions: - - key: rollouts.kruise.io/workload-type - operator: Exists + rules: + - apiGroups: + - apps + apiVersions: + - v1 + operations: + - UPDATE + resources: + - statefulsets + sideEffects: None + - admissionReviewVersions: + - v1 + - v1beta1 + clientConfig: + service: + name: kruise-rollout-webhook-service + namespace: {{ .Values.installation.namespace }} + path: /mutate-apps-kruise-io-statefulset + failurePolicy: Fail + name: madvancedstatefulset.kb.io + objectSelector: + matchExpressions: + - key: rollouts.kruise.io/workload-type + operator: Exists {{- if .Values.rollout.webhook.objectSelector }} {{- range $label := .Values.rollout.webhook.objectSelector }} - - key: {{ $label.key }} - operator: {{ $label.operator }} + - key: {{ $label.key }} + operator: {{ $label.operator }} {{- if $label.values}} - values: + values: {{- range $value := $label.values }} - - {{ $value }} + - {{ $value }} {{- end }} {{- end}} {{- end }} {{- end }} - rules: - - apiGroups: - - apps.kruise.io - apiVersions: - - v1alpha1 - - v1beta1 - operations: - - CREATE - - UPDATE - resources: - - statefulsets - sideEffects: None -- admissionReviewVersions: - - v1 - - v1beta1 - clientConfig: - service: - name: kruise-rollout-webhook-service - namespace: {{ .Values.installation.namespace }} - path: /mutate-apps-kruise-io-v1alpha1-daemonset - failurePolicy: Fail - name: mdaemonset.kb.io - objectSelector: - matchExpressions: - - key: rollouts.kruise.io/workload-type - operator: Exists + rules: + - apiGroups: + - apps.kruise.io + apiVersions: + - v1alpha1 + - v1beta1 + operations: + - CREATE + - UPDATE + resources: + - statefulsets + sideEffects: None + - admissionReviewVersions: + - v1 + - v1beta1 + clientConfig: + service: + name: kruise-rollout-webhook-service + namespace: {{ .Values.installation.namespace }} + path: /mutate-apps-kruise-io-v1alpha1-daemonset + failurePolicy: Fail + name: mdaemonset.kb.io + objectSelector: + matchExpressions: + - key: rollouts.kruise.io/workload-type + operator: Exists {{- if .Values.rollout.webhook.objectSelector }} {{- range $label := .Values.rollout.webhook.objectSelector }} - - key: {{ $label.key }} - operator: {{ $label.operator }} + - key: {{ $label.key }} + operator: {{ $label.operator }} {{- if $label.values }} - values: + values: {{- range $value := $label.values }} - - {{ $value }} + - {{ $value }} {{- end }} {{- end }} {{- end }} {{- end }} - rules: - - apiGroups: - - apps.kruise.io - apiVersions: - - v1alpha1 - operations: - - UPDATE - resources: - - daemonsets - sideEffects: None + rules: + - apiGroups: + - apps.kruise.io + apiVersions: + - v1alpha1 + operations: + - UPDATE + resources: + - daemonsets + sideEffects: None --- apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration @@ -235,25 +234,25 @@ metadata: creationTimestamp: null name: kruise-rollout-validating-webhook-configuration webhooks: -- admissionReviewVersions: - - v1 - - v1beta1 - clientConfig: - service: - name: kruise-rollout-webhook-service - namespace: {{ .Values.installation.namespace }} - path: /validate-rollouts-kruise-io-rollout - failurePolicy: Fail - name: vrollout.kb.io - rules: - - apiGroups: - - rollouts.kruise.io - apiVersions: - - v1alpha1 - - v1beta1 - operations: - - CREATE - - UPDATE - resources: - - rollouts - sideEffects: None + - admissionReviewVersions: + - v1 + - v1beta1 + clientConfig: + service: + name: kruise-rollout-webhook-service + namespace: {{ .Values.installation.namespace }} + path: /validate-rollouts-kruise-io-rollout + failurePolicy: Fail + name: vrollout.kb.io + rules: + - apiGroups: + - rollouts.kruise.io + apiVersions: + - v1alpha1 + - v1beta1 + operations: + - CREATE + - UPDATE + resources: + - rollouts + sideEffects: None