Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tilt metrics fix + docs update #308

Merged
merged 3 commits into from
Jun 6, 2024
Merged

Tilt metrics fix + docs update #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a06757d
Remove manager metrics patch
hrak Sep 1, 2023
9c9a7c9
Remove old credentials substition
hrak Sep 1, 2023
6009a1c
add explicit metrics bind addr arg that Tilt and e2e can replace
hrak Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion config/default/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ patchesStrategicMerge:
- manager_image_patch_edited.yaml
- manager_webhook_patch.yaml
- webhookcainjection_patch.yaml
- manager_prometheus_metrics_patch.yaml
hrak marked this conversation as resolved.
Show resolved Hide resolved

# Protect the /metrics endpoint by putting it behind auth.
# If you want your controller-manager to expose the /metrics
Expand Down
19 changes: 0 additions & 19 deletions config/default/manager_prometheus_metrics_patch.yaml
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,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:
Expand Down
12 changes: 11 additions & 1 deletion docs/book/src/development/tilt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
vishesh92 marked this conversation as resolved.
Show resolved Hide resolved
}
}
```
Expand Down
2 changes: 0 additions & 2 deletions test/e2e/config/cloudstack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,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"
Expand Down