🌱 Remove unused enableHelmHook feature from Helm chart

kahirokunn · kahirokunn · commit 03f3fa8b9908 · 2025-06-24T09:42:49.000+09:00
Signed-off-by: kahirokunn &lt;okinakahiro@gmail.com&gt;
diff --git a/hack/charts/cluster-api-operator-providers/templates/addon.yaml b/hack/charts/cluster-api-operator-providers/templates/addon.yaml
@@ -9,10 +9,6 @@ apiVersion: v1
 kind: Namespace
 metadata:
   annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "1"
-    {{- end }}
     "argocd.argoproj.io/sync-wave": "1"
   name: {{ $addonNamespace }}
 {{- end }}
@@ -23,10 +19,6 @@ metadata:
   name: {{ $addonName }}
   namespace: {{ $addonNamespace }}
   annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "2"
-    {{- end }}
     "argocd.argoproj.io/sync-wave": "2"
 {{- if or $addonVersion $.Values.secretName }}
 spec:
diff --git a/hack/charts/cluster-api-operator-providers/templates/bootstrap.yaml b/hack/charts/cluster-api-operator-providers/templates/bootstrap.yaml
@@ -9,10 +9,6 @@ apiVersion: v1
 kind: Namespace
 metadata:
   annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "1"
-    {{- end }}
     "argocd.argoproj.io/sync-wave": "1"
   name: {{ $bootstrapNamespace }}
 {{- end }}
@@ -23,10 +19,6 @@ metadata:
   name: {{ $bootstrapName }}
   namespace: {{ $bootstrapNamespace }}
   annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "2"
-    {{- end }}
     "argocd.argoproj.io/sync-wave": "2"
 {{- if or $bootstrapVersion $.Values.configSecret.name }}
 spec:
diff --git a/hack/charts/cluster-api-operator-providers/templates/control-plane.yaml b/hack/charts/cluster-api-operator-providers/templates/control-plane.yaml
@@ -9,10 +9,6 @@ apiVersion: v1
 kind: Namespace
 metadata:
   annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "1"
-    {{- end }}
     "argocd.argoproj.io/sync-wave": "1"
   name: {{ $controlPlaneNamespace }}
 {{- end }}
@@ -23,10 +19,6 @@ metadata:
   name: {{ $controlPlaneName }}
   namespace: {{ $controlPlaneNamespace }}
   annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "2"
-    {{- end }}
     "argocd.argoproj.io/sync-wave": "2"
 {{- if or $controlPlaneVersion $.Values.configSecret.name $.Values.manager }}
 spec:
diff --git a/hack/charts/cluster-api-operator-providers/templates/core-conditions.yaml b/hack/charts/cluster-api-operator-providers/templates/core-conditions.yaml
@@ -6,10 +6,6 @@ apiVersion: v1
 kind: Namespace
 metadata:
   annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "1"
-    {{- end }}
     "argocd.argoproj.io/sync-wave": "1"
   name: capi-system
 ---
@@ -19,10 +15,6 @@ metadata:
   name: cluster-api
   namespace: capi-system
   annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "2"
-    {{- end }}
     "argocd.argoproj.io/sync-wave": "2"
 {{- with .Values.configSecret }}
 spec:
diff --git a/hack/charts/cluster-api-operator-providers/templates/core.yaml b/hack/charts/cluster-api-operator-providers/templates/core.yaml
@@ -9,10 +9,6 @@ apiVersion: v1
 kind: Namespace
 metadata:
   annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "1"
-    {{- end }}
     "argocd.argoproj.io/sync-wave": "1"
   name: {{ $coreNamespace }}
 {{- end }}
@@ -23,10 +19,6 @@ metadata:
   name: {{ $coreName }}
   namespace: {{ $coreNamespace }}
   annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "2"
-    {{- end }}
     "argocd.argoproj.io/sync-wave": "2"
 {{- if or $coreVersion $.Values.configSecret.name $.Values.manager }}
 spec:
diff --git a/hack/charts/cluster-api-operator-providers/templates/infra-conditions.yaml b/hack/charts/cluster-api-operator-providers/templates/infra-conditions.yaml
@@ -7,10 +7,6 @@ apiVersion: v1
 kind: Namespace
 metadata:
   annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "1"
-    {{- end }}
     "argocd.argoproj.io/sync-wave": "1"
   name: capi-kubeadm-bootstrap-system
 ---
@@ -20,10 +16,6 @@ metadata:
   name: kubeadm
   namespace: capi-kubeadm-bootstrap-system
   annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "2"
-    {{- end }}
     "argocd.argoproj.io/sync-wave": "2"
 {{- with .Values.configSecret }}
 spec:
@@ -41,10 +33,6 @@ apiVersion: v1
 kind: Namespace
 metadata:
   annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "1"
-    {{- end }}
     "argocd.argoproj.io/sync-wave": "1"
   name: capi-kubeadm-control-plane-system
 ---
@@ -54,10 +42,6 @@ metadata:
   name: kubeadm
   namespace: capi-kubeadm-control-plane-system
   annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "2"
-    {{- end }}
     "argocd.argoproj.io/sync-wave": "2"
 {{- with .Values.configSecret }}
 spec:
diff --git a/hack/charts/cluster-api-operator-providers/templates/infra.yaml b/hack/charts/cluster-api-operator-providers/templates/infra.yaml
@@ -9,10 +9,6 @@ apiVersion: v1
 kind: Namespace
 metadata:
   annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "1"
-    {{- end }}
     "argocd.argoproj.io/sync-wave": "1"
   name: {{ $infrastructureNamespace }}
 {{- end }}
@@ -23,10 +19,6 @@ metadata:
   name: {{ $infrastructureName }}
   namespace: {{ $infrastructureNamespace }}
   annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "2"
-    {{- end }}
     "argocd.argoproj.io/sync-wave": "2"
 {{- if or $infrastructureVersion $.Values.configSecret.name $.Values.manager $.Values.additionalDeployments }}
 spec:
diff --git a/hack/charts/cluster-api-operator-providers/templates/ipam.yaml b/hack/charts/cluster-api-operator-providers/templates/ipam.yaml
@@ -9,10 +9,6 @@ apiVersion: v1
 kind: Namespace
 metadata:
   annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "1"
-    {{- end }}
     "argocd.argoproj.io/sync-wave": "1"
   name: {{ $ipamNamespace }}
 {{- end }}
@@ -23,10 +19,6 @@ metadata:
   name: {{ $ipamName }}
   namespace: {{ $ipamNamespace }}
   annotations:
-    {{- if $.Values.enableHelmHook }}
-    "helm.sh/hook": "post-install,post-upgrade"
-    "helm.sh/hook-weight": "2"
-    {{- end }}
     "argocd.argoproj.io/sync-wave": "2"
 {{- if or $ipamVersion $.Values.configSecret.name $.Values.manager $.Values.additionalDeployments }}
 spec:
diff --git a/hack/charts/cluster-api-operator-providers/values.schema.json b/hack/charts/cluster-api-operator-providers/values.schema.json
@@ -56,10 +56,6 @@
     },
     "configSecret": {
       "type": "object"
-    },
-    "enableHelmHook": {
-      "type": "boolean",
-      "default": false
     }
   }
 }
diff --git a/hack/charts/cluster-api-operator-providers/values.yaml b/hack/charts/cluster-api-operator-providers/values.yaml
@@ -45,4 +45,3 @@ fetchConfig: {}
 # ---
 # Common configuration secret options
 configSecret: {}
-enableHelmHook: false  # Provider CRsではHookは不要

Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,6 @@`
`56`	`56`	`},`
`57`	`57`	`"configSecret": {`
`58`	`58`	`"type": "object"`
`59`		`- },`
`60`		`- "enableHelmHook": {`
`61`		`- "type": "boolean",`
`62`		`- "default": false`
`63`	`59`	`}`
`64`	`60`	`}`
`65`	`61`	`}`