Merge pull request #308 from hrak/tilt_metrics_fix

Tilt metrics fix + docs update
kubernetes-sigs · Jun 6, 2024 · c9f02ad · c9f02ad
2 parents ea9c5f6 + 6009a1c
commit c9f02ad
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 26 deletions.
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -28,7 +28,6 @@ patchesStrategicMerge:
 - manager_image_patch_edited.yaml
 - manager_webhook_patch.yaml
 - webhookcainjection_patch.yaml
-- manager_prometheus_metrics_patch.yaml
 
 # Protect the /metrics endpoint by putting it behind auth.
 # If you want your controller-manager to expose the /metrics

diff --git a/config/default/manager_prometheus_metrics_patch.yaml b/config/default/manager_prometheus_metrics_patch.yaml
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -23,9 +23,10 @@ spec:
       - command:
         - /manager
         args:
-        - --leader-elect
-        - --cloudstackcluster-concurrency=${CAPC_CLOUDSTACKCLUSTER_CONCURRENCY:=10}
-        - --cloudstackmachine-concurrency=${CAPC_CLOUDSTACKMACHINE_CONCURRENCY:=10}
+        - "--leader-elect"
+        - "--metrics-bind-addr=localhost:8080"
+        - "--cloudstackcluster-concurrency=${CAPC_CLOUDSTACKCLUSTER_CONCURRENCY:=10}"
+        - "--cloudstackmachine-concurrency=${CAPC_CLOUDSTACKMACHINE_CONCURRENCY:=10}"
         image: controller:latest
         name: manager
         securityContext:

diff --git a/docs/book/src/development/tilt.md b/docs/book/src/development/tilt.md
@@ -35,13 +35,23 @@ Next, create a `tilt-settings.json` file and place it in your local copy of `clu
 
 **Example `tilt-settings.json` for CAPC clusters:**
 
+```json
+{
+    "default_registry": "gcr.io/your-project-name-here",
+    "provider_repos": ["../cluster-api-provider-cloudstack"],
+    "enable_providers": ["kubeadm-bootstrap", "kubeadm-control-plane", "cloudstack"]
+}
+```
+
+**Example `tilt-settings.json` for CAPC clusters with experimental feature gate:**
+
 ```json
 {
     "default_registry": "gcr.io/your-project-name-here",
     "provider_repos": ["../cluster-api-provider-cloudstack"],
     "enable_providers": ["kubeadm-bootstrap", "kubeadm-control-plane", "cloudstack"],
     "kustomize_substitutions": {
-        "CLOUDSTACK_B64ENCODED_CREDENTIALS": "RANDOM_STRING==",
+        "EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION": "true",
     }
 }
 ```

diff --git a/test/e2e/config/cloudstack.yaml b/test/e2e/config/cloudstack.yaml
@@ -106,8 +106,6 @@ providers:
         replacements:
           - old: --metrics-bind-addr=localhost:8080
             new: --metrics-bind-addr=:8080
-          - old: "--leader-elect"
-            new: "--leader-elect\n        - --metrics-bind-addr=:8080"
 
 variables:
   KUBERNETES_VERSION_MANAGEMENT: "v1.25.3"