Skip to content

Commit aa4fc5a

Browse files
committed
docs: update docs for 0.4.0 release
1 parent 9c380ac commit aa4fc5a

File tree

2 files changed

+21
-17
lines changed

2 files changed

+21
-17
lines changed

docs/README.md

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
* [Glossary](#glossary)
88
* [Prerequisites](#prerequisites)
99
* [Installation](#installation)
10-
+ [Method 1: Apply Manifests from Release Assets](#method-1--apply-manifests-from-release-assets)
11-
+ [Method 2: Use Helm Charts](#method-2--use-helm-charts)
10+
+ [Method 1: Apply Manifests from Release Assets](#method-1-apply-manifests-from-release-assets)
11+
+ [Method 2: Use Helm Charts](#method-2-use-helm-charts)
1212
* [Configuration](#configuration)
1313
+ [Examples of Configuration Options](#examples-of-configuration-options)
1414
* [Basic Cluster API Provider Installation](#basic-cluster-api-provider-installation)
1515
+ [Installing the CoreProvider](#installing-the-coreprovider)
1616
+ [Installing Azure Infrastructure Provider](#installing-azure-infrastructure-provider)
1717
+ [Deleting providers](#deleting-providers)
18-
- [Custom Resource Definitions (CRDs)](#custom-resource-definitions--crds-)
18+
- [Custom Resource Definitions (CRDs)](#custom-resource-definitions-crds)
1919
* [Overview](#overview-1)
2020
* [Provider Spec](#provider-spec)
2121
* [Provider Status](#provider-status)
@@ -186,7 +186,7 @@ metadata:
186186
name: azure
187187
namespace: capz-system
188188
spec:
189-
version: v1.9.2
189+
version: v1.9.3
190190
secretName: azure-variables
191191
```
192192

@@ -265,7 +265,8 @@ The following sections provide details about `ProviderSpec` and `ProviderStatus`
265265
- Version (string): provider version (e.g., "v0.1.0")
266266
- Manager (optional ManagerSpec): controller manager properties for the provider
267267
- Deployment (optional DeploymentSpec): deployment properties for the provider
268-
- SecretName (optional string): secret containing provider credentials
268+
- SecretName (optional string): name of the secret that contains provider credentials
269+
- SecretNamespace (optional string): namespace of the secret that contains provider credentials
269270
- FetchConfig (optional FetchConfiguration): how the operator will fetch components and metadata
270271

271272
YAML example:
@@ -309,6 +310,8 @@ The following sections provide details about `ProviderSpec` and `ProviderStatus`
309310
- Tolerations (optional []corev1.Toleration): pod tolerations
310311
- Affinity (optional corev1.Affinity): pod scheduling constraints
311312
- Containers (optional []ContainerSpec): list of deployment containers
313+
- ServiceAccountName (optional string): pod service account
314+
- ImagePullSecrets (optional []corev1.LocalObjectReference): list of image pull secrets specified in the Deployment
312315

313316
YAML example:
314317
```yaml
@@ -446,18 +449,19 @@ spec:
446449
# These top level controller manager flags, supported by all the providers.
447450
# These flags come with sensible defaults, thus requiring no or minimal
448451
# changes for the most common scenarios.
449-
metricsAddress: ":8181"
450-
syncPeriod: 660
452+
metrics:
453+
bindAddress: ":8181"
454+
syncPeriod: "500s"
451455
fetchConfig:
452456
url: https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases
453457
deployment:
454458
containers:
455459
- name: manager
456460
args:
457-
# These are controller flags that are specific to a provider; usage
458-
# is reserved for advanced scenarios only.
459-
awscluster-concurrency: 12
460-
awsmachine-concurrency: 11
461+
# These are controller flags that are specific to a provider; usage
462+
# is reserved for advanced scenarios only.
463+
"--awscluster-concurrency": "12"
464+
"--awsmachine-concurrency": "11"
461465
```
462466
463467
2. As an admin, I want to install aws infrastructure provider but override the container image of the CAPA deployment.
@@ -515,7 +519,7 @@ metadata:
515519
name: myazure
516520
namespace: capz-system
517521
spec:
518-
version: v1.9.2
522+
version: v1.9.3
519523
secretName: azure-variables
520524
fetchConfig:
521525
url: https://github.com/myorg/awesome-azure-provider/releases
@@ -611,7 +615,7 @@ As an admin, I need to fetch the Azure provider components from within the clust
611615

612616
In this example, there is a ConfigMap in the `capz-system` namespace that defines the components and metadata of the provider.
613617

614-
The Azure InfrastructureProvider is configured with a `fetchConfig` specifying the label selector, allowing the operator to determine the available versions of the Azure provider. Since the provider's version is marked as `v1.9.2`, the operator uses the components information from the ConfigMap with matching label to install the Azure provider.
618+
The Azure InfrastructureProvider is configured with a `fetchConfig` specifying the label selector, allowing the operator to determine the available versions of the Azure provider. Since the provider's version is marked as `v1.9.3`, the operator uses the components information from the ConfigMap with matching label to install the Azure provider.
615619

616620
```yaml
617621
---
@@ -620,11 +624,11 @@ kind: ConfigMap
620624
metadata:
621625
labels:
622626
provider-components: azure
623-
name: v1.9.2
627+
name: v1.9.3
624628
namespace: capz-system
625629
data:
626630
components: |
627-
# Components for v1.9.2 YAML go here
631+
# Components for v1.9.3 YAML go here
628632
metadata: |
629633
# Metadata information goes here
630634
---
@@ -634,7 +638,7 @@ metadata:
634638
name: azure
635639
namespace: capz-system
636640
spec:
637-
version: v1.9.2
641+
version: v1.9.3
638642
secretName: azure-variables
639643
fetchConfig:
640644
selector:

internal/controller/preflight_checks.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ var (
4444
moreThanOneCoreProviderInstanceExistsMessage = "CoreProvider already exists in the cluster. Only one is allowed."
4545
moreThanOneProviderInstanceExistsMessage = "There is already a %s with name %s in the cluster. Only one is allowed."
4646
capiVersionIncompatibilityMessage = "CAPI operator is only compatible with %s providers, detected %s for provider %s."
47-
invalidGithubTokenMessage = "Invalid github token, please check your github token value and it's permissions" //nolint:gosec
47+
invalidGithubTokenMessage = "Invalid github token, please check your github token value and its permissions" //nolint:gosec
4848
waitingForCoreProviderReadyMessage = "Waiting for the core provider to be installed."
4949
emptyVersionMessage = "Version cannot be empty"
5050
)

0 commit comments

Comments
 (0)