Skip to content

Commit 97a4518

Browse files
authored
Merge pull request #611 from pjbgf/documentation-v1beta2
Update KubeConfig documentation
2 parents 3ebc24e + d006970 commit 97a4518

File tree

3 files changed

+23
-5
lines changed

3 files changed

+23
-5
lines changed

api/v1beta2/kustomization_types.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,12 @@ type KustomizationSpec struct {
5757
RetryInterval *metav1.Duration `json:"retryInterval,omitempty"`
5858

5959
// The KubeConfig for reconciling the Kustomization on a remote cluster.
60-
// When specified, KubeConfig takes precedence over ServiceAccountName.
60+
// When used in combination with KustomizationSpec.ServiceAccountName,
61+
// forces the controller to act on behalf of that Service Account at the
62+
// target cluster.
63+
// If the --default-service-account flag is set, its value will be used as
64+
// a controller level fallback for when KustomizationSpec.ServiceAccountName
65+
// is empty.
6166
// +optional
6267
KubeConfig *KubeConfig `json:"kubeConfig,omitempty"`
6368

config/crd/bases/kustomize.toolkit.fluxcd.io_kustomizations.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -691,8 +691,11 @@ spec:
691691
type: string
692692
kubeConfig:
693693
description: The KubeConfig for reconciling the Kustomization on a
694-
remote cluster. When specified, KubeConfig takes precedence over
695-
ServiceAccountName.
694+
remote cluster. When used in combination with KustomizationSpec.ServiceAccountName,
695+
forces the controller to act on behalf of that Service Account at
696+
the target cluster. If the --default-service-account flag is set,
697+
its value will be used as a controller level fallback for when KustomizationSpec.ServiceAccountName
698+
is empty.
696699
properties:
697700
secretRef:
698701
description: SecretRef holds the name to a secret that contains

docs/api/kustomize.md

+12-2
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,12 @@ KubeConfig
139139
<td>
140140
<em>(Optional)</em>
141141
<p>The KubeConfig for reconciling the Kustomization on a remote cluster.
142-
When specified, KubeConfig takes precedence over ServiceAccountName.</p>
142+
When used in combination with KustomizationSpec.ServiceAccountName,
143+
forces the controller to act on behalf of that Service Account at the
144+
target cluster.
145+
If the &ndash;default-service-account flag is set, its value will be used as
146+
a controller level fallback for when KustomizationSpec.ServiceAccountName
147+
is empty.</p>
143148
</td>
144149
</tr>
145150
<tr>
@@ -624,7 +629,12 @@ KubeConfig
624629
<td>
625630
<em>(Optional)</em>
626631
<p>The KubeConfig for reconciling the Kustomization on a remote cluster.
627-
When specified, KubeConfig takes precedence over ServiceAccountName.</p>
632+
When used in combination with KustomizationSpec.ServiceAccountName,
633+
forces the controller to act on behalf of that Service Account at the
634+
target cluster.
635+
If the &ndash;default-service-account flag is set, its value will be used as
636+
a controller level fallback for when KustomizationSpec.ServiceAccountName
637+
is empty.</p>
628638
</td>
629639
</tr>
630640
<tr>

0 commit comments

Comments
 (0)