Merge pull request #67 from cloudymax/v0.0.2

capi resources in the right namespaces
cloudymax · Jan 1, 2025 · 49b2b0c · 49b2b0c
2 parents 175ed2d + 1c2e17f
commit 49b2b0c
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 25 deletions.
diff --git a/charts/capi-operator/Chart.yaml b/charts/capi-operator/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: cluster-api-operator
 description: Cluster API Operator
 type: application
-version: 0.0.0
+version: 0.0.1
 appVersion: "0.0.0"
diff --git a/charts/capi-operator/README.md b/charts/capi-operator/README.md
@@ -1,15 +1,13 @@
 # cluster-api-operator
 
-![Version: 0.0.0](https://img.shields.io/badge/Version-0.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.0](https://img.shields.io/badge/AppVersion-0.0.0-informational?style=flat-square)
+![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.0](https://img.shields.io/badge/AppVersion-0.0.0-informational?style=flat-square)
 
 Cluster API Operator
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| "manager.featureGates".KubeadmBootstrapFormatIgnition | bool | `true` |  |
-| "manager.featureGates".MachinePool | bool | `true` |  |
 | addon | string | `""` |  |
 | affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key | string | `"kubernetes.io/arch"` |  |
 | affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].operator | string | `"In"` |  |
@@ -19,30 +17,19 @@ Cluster API Operator
 | affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[1].key | string | `"kubernetes.io/os"` |  |
 | affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[1].operator | string | `"In"` |  |
 | affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[1].values[0] | string | `"linux"` |  |
-| args[0] | string | `"--v=2"` |  |
-| args[1] | string | `"--health-addr=\"0.0.0.0:8081\""` |  |
-| args[2] | string | `"--metrics-bind-addr=\"0.0.0.0:8080\""` |  |
-| args[3] | string | `"--diagnostics-address=\"0.0.0.0:8443\""` |  |
-| args[4] | string | `"--insecure-diagnostics=true"` |  |
-| args[5] | string | `"--watch-configsecret"` |  |
-| args[6] | string | `"--leader-elect=true"` |  |
-| args[7] | string | `"--bootstrap-token-ttl=15m"` |  |
-| bootstrap | string | `"kubeadm:v1.7.2"` |  |
+| args[0] | string | `"--leader-elect"` |  |
+| bootstrap | string | `"kubeadm:v1.9.1"` |  |
 | configSecret | object | `{}` |  |
 | containerSecurityContext | object | `{}` |  |
-| controlPlane | string | `"kubeadm:v1.7.2"` |  |
-| core | string | `"cluster-api:v1.7.2"` |  |
+| controlPlane | string | `"kubeadm:v1.9.1"` |  |
+| core | string | `"cluster-api:v1.9.1"` |  |
 | env.manager | list | `[]` |  |
-| featureGates.BootstrapTokenTtl | string | `"15m"` |  |
-| featureGates.KubeadmBootstrapFormatIgnition | string | `"true"` |  |
-| featureGates.MachinePool | string | `"false"` |  |
-| featureGates.enabled | bool | `false` |  |
 | image.manager.pullPolicy | string | `"IfNotPresent"` |  |
 | image.manager.repository | string | `"registry.k8s.io/capi-operator/cluster-api-operator"` |  |
 | image.manager.tag | string | `"v0.15.0"` |  |
 | imagePullSecrets | object | `{}` |  |
-| infrastructure | string | `"kubevirt:v0.1.8"` |  |
-| leaderElection.enabled | bool | `true` |  |
+| infrastructure | string | `"kubevirt:v0.1.9"` |  |
+| manager | object | `{}` |  |
 | replicaCount | int | `1` |  |
 | resources.manager.limits.cpu | string | `"100m"` |  |
 | resources.manager.limits.memory | string | `"150Mi"` |  |

diff --git a/charts/capi-operator/templates/clusterrole.yaml b/charts/capi-operator/templates/clusterrole.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
     clusterctl.cluster.x-k8s.io/core: capi-operator
   name: capi-operator-manager-role
+  namespace: capi-operator-system
 rules:
   - apiGroups:
       - '*'

diff --git a/charts/capi-operator/templates/clusterrolebinding.yaml b/charts/capi-operator/templates/clusterrolebinding.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
     clusterctl.cluster.x-k8s.io/core: capi-operator
   name: capi-operator-manager-rolebinding
+  namespace: capi-operator-system
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

diff --git a/charts/capi-operator/templates/mutatingwebhookconfiguration.yaml b/charts/capi-operator/templates/mutatingwebhookconfiguration.yaml
@@ -7,6 +7,7 @@ metadata:
   labels:
     clusterctl.cluster.x-k8s.io/core: capi-operator
   name: capi-operator-mutating-webhook-configuration
+  namespace: capi-operator-system
 webhooks:
   - admissionReviewVersions:
       - v1

diff --git a/charts/capi-operator/templates/namespace.yaml b/charts/capi-operator/templates/namespace.yaml
@@ -1,6 +1,8 @@
 apiVersion: v1
 kind: Namespace
 metadata:
+  annotations:
+    "helm.sh/hook-weight": "-1"
   labels:
     clusterctl.cluster.x-k8s.io/core: capi-operator
     control-plane: controller-manager

diff --git a/charts/capi-operator/templates/validatingwebhookconfiguration.yaml b/charts/capi-operator/templates/validatingwebhookconfiguration.yaml
@@ -7,6 +7,7 @@ metadata:
   labels:
     clusterctl.cluster.x-k8s.io/core: capi-operator
   name: capi-operator-validating-webhook-configuration
+  name: capi-operator-system
 webhooks:
   - admissionReviewVersions:
       - v1

diff --git a/charts/capi-operator/values.yaml b/charts/capi-operator/values.yaml
@@ -1,8 +1,8 @@
 ---
-core: "cluster-api:v1.7.2"
-bootstrap: "kubeadm:v1.7.2"
-controlPlane: "kubeadm:v1.7.2"
-infrastructure: "kubevirt:v0.1.8"
+core: "cluster-api:v1.9.1"
+bootstrap: "kubeadm:v1.9.1"
+controlPlane: "kubeadm:v1.9.1"
+infrastructure: "kubevirt:v0.1.9"
 addon: ""
 
 manager: {}