Skip to content

Commit 0b7ce24

Browse files
Abirdcflystevend-uber
authored andcommitted
chore: remove duplicate word in comments (spiffe#3377)
Signed-off-by: Abirdcfly <[email protected]>
1 parent 82e76ca commit 0b7ce24

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

conf/server/server_full.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ plugins {
600600
# be the path to a file that must contain one or more certificates
601601
# representing the upstream root certificates and the file at
602602
# cert_file_path contains one or more certificates necessary to chain up
603-
# the the root certificates in bundle_file_path (where the first
603+
# the root certificates in bundle_file_path (where the first
604604
# certificate in cert_file_path is the upstream CA certificate).
605605
# bundle_file_path = ""
606606
}

doc/plugin_server_upstreamauthority_disk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The plugin accepts the following configuration options:
1818
| ----------------| ---------------------------------------------------- |
1919
| cert_file_path | If SPIRE is using a self-signed CA, `cert_file_path` should specify the path to a single PEM encoded certificate representing the upstream CA certificate. If not self-signed, `cert_file_path` should specify the path to a file that must contain one or more certificates necessary to establish a valid certificate chain up the root certificates defined in `bundle_file_path`. |
2020
| key_file_path | Path to the "upstream" CA key file. Key files must contain a single PEM encoded key. The supported key types are EC (ASN.1 or PKCS8 encoded) or RSA (PKCS1 or PKCS8 encoded).|
21-
| bundle_file_path| If SPIRE is using a self-signed CA, `bundle_file_path` can be left unset. If not self-signed, then `bundle_file_path` should be the path to a file that must contain one or more certificates representing the upstream root certificates and the file at cert_file_path contains one or more certificates necessary to chain up the the root certificates in bundle_file_path (where the first certificate in cert_file_path is the upstream CA certificate). |
21+
| bundle_file_path| If SPIRE is using a self-signed CA, `bundle_file_path` can be left unset. If not self-signed, then `bundle_file_path` should be the path to a file that must contain one or more certificates representing the upstream root certificates and the file at cert_file_path contains one or more certificates necessary to chain up the root certificates in bundle_file_path (where the first certificate in cert_file_path is the upstream CA certificate). |
2222

2323
The `disk` plugin is able to function as either a root CA, or join an existing PKI.
2424

pkg/common/catalog/constraints.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ type Constraints struct {
2525
// zero, there is no lower bound (i.e. the plugin type is optional).
2626
Min int
2727

28-
// Max is the the maximum number of plugins required of a specific type. If
28+
// Max is the maximum number of plugins required of a specific type. If
2929
// zero, there is no upper bound.
3030
Max int
3131
}

pkg/server/ca/manager_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func (s *ManagerSuite) TestPersistenceFailsIfJournalLost() {
129129
x509CA, jwtKey := s.currentX509CA(), s.currentJWTKey()
130130

131131
// wipe the journal, reinitialize, and make sure the keys differ. this
132-
// simulates the the key manager having dangling keys.
132+
// simulates the key manager having dangling keys.
133133
s.wipeJournal()
134134
s.initSelfSignedManager()
135135
s.requireX509CANotEqual(x509CA, s.currentX509CA())

pkg/server/plugin/notifier/gcsbundle/gcsbundle.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func (p *Plugin) updateBundleObject(ctx context.Context, c *pluginConfig) (err e
156156
}
157157
p.log.Debug("Bundle object retrieved", telemetry.Generation, generation)
158158

159-
// Load bundle data from the the identity provider. The bundle has to
159+
// Load bundle data from the identity provider. The bundle has to
160160
// be loaded after fetching the generation so we can properly detect
161161
// and correct a race updating the bundle (i.e. read-modify-write
162162
// semantics).

pkg/server/plugin/notifier/k8sbundle/k8sbundle.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ func (c mutatingWebhookClient) CreatePatch(ctx context.Context, obj runtime.Obje
573573
}
574574
patch.Webhooks = make([]admissionv1.MutatingWebhook, len(mutatingWebhook.Webhooks))
575575

576-
// Step through all the the webhooks in the MutatingWebhookConfiguration
576+
// Step through all the webhooks in the MutatingWebhookConfiguration
577577
for i := range patch.Webhooks {
578578
patch.Webhooks[i].AdmissionReviewVersions = mutatingWebhook.Webhooks[i].AdmissionReviewVersions
579579
patch.Webhooks[i].ClientConfig.CABundle = []byte(bundleData(resp.Bundle))
@@ -644,7 +644,7 @@ func (c validatingWebhookClient) CreatePatch(ctx context.Context, obj runtime.Ob
644644
}
645645
patch.Webhooks = make([]admissionv1.ValidatingWebhook, len(validatingWebhook.Webhooks))
646646

647-
// Step through all the the webhooks in the ValidatingWebhookConfiguration
647+
// Step through all the webhooks in the ValidatingWebhookConfiguration
648648
for i := range patch.Webhooks {
649649
patch.Webhooks[i].AdmissionReviewVersions = validatingWebhook.Webhooks[i].AdmissionReviewVersions
650650
patch.Webhooks[i].ClientConfig.CABundle = []byte(bundleData(resp.Bundle))

support/k8s/k8s-workload-registrar/mode-crd/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This enables auto and manual generation of SPIFFE IDs from with Kubenretes and t
77

88
There are mutiple modes of the Kubernetes Workload Registrar. The benefits of the CRD mode when compared to other modes are:
99

10-
* **`kubectl` integration**: Using a CRD, SPIRE is fully intergrated with Kubernetes. You can view and create SPIFFE IDs directly using `kubectl`, without having to shell into the the SPIRE server.
10+
* **`kubectl` integration**: Using a CRD, SPIRE is fully intergrated with Kubernetes. You can view and create SPIFFE IDs directly using `kubectl`, without having to shell into the SPIRE server.
1111
* **Fully event-driven design**: Using the Kubernetes CRD system, the CRD mode Kubernetes Workload Registrar is fully event-driven to minimze resource usage.
1212
* **Standards-based solution**: CRDs are the standard way to extend Kubernetes, with many resources online, such as [kubebuilder](https://book.kubebuilder.io/), discussing the approach. The CRD Kubernetes Worklaod Registrar follows all standards and best practices to ensure it is maintainable.
1313

@@ -424,7 +424,7 @@ Entries can be created manually and automatically. For automatic generation, ent
424424

425425
### Finalizers
426426

427-
[Finalizers](https://book.kubebuilder.io/reference/using-finalizers.html) are added to all SpiffeID resources, manual or automatically created. This ensures that entries on the SPIRE Server are properly cleaned up when a SpiffeID resource is deleted by blocking deletion of the resource until the SPIRE Server entry is first deleted. This important for the scenario where the the Kubernetes Workload Registrar is down when a SpiffeID resource is deleted.
427+
[Finalizers](https://book.kubebuilder.io/reference/using-finalizers.html) are added to all SpiffeID resources, manual or automatically created. This ensures that entries on the SPIRE Server are properly cleaned up when a SpiffeID resource is deleted by blocking deletion of the resource until the SPIRE Server entry is first deleted. This important for the scenario where the Kubernetes Workload Registrar is down when a SpiffeID resource is deleted.
428428

429429
This has the potential side effect of blocking deletion of a namespace until all the SpiffeID resources in that namespace are first deleted.
430430

0 commit comments

Comments
 (0)