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.

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

[CHORE] Spelling 1/n #3204

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ can run it locally on your dev machine with the steps below.
If you are adding a new resource, you need to follow the steps in [NewResourceFromTerraform.md](README.ChangingTerraform.md)
to make code changes, add test data, and run the tests for your resource.

If you are working on a existing resource, test yaml should exist under
If you are working on an existing resource, test yaml should exist under
./pkg/test/resourcefixture/testdata/basic, you can run the test command directly
to make sure the test can still pass. Example command:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ type DiscoveryEngineDataStoreStatus struct {
// +kcc:proto=google.cloud.discoveryengine.v1.DataStore
type DiscoveryEngineDataStoreObservedState struct {
// Output only. The id of the default
// [Schema][google.cloud.discoveryengine.v1.Schema] asscociated to this data
// [Schema][google.cloud.discoveryengine.v1.Schema] associated to this data
// store.
DefaultSchemaID *string `json:"defaultSchemaID,omitempty"`

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ spec:
type: string
defaultSchemaID:
description: Output only. The id of the default [Schema][google.cloud.discoveryengine.v1.Schema]
asscociated to this data store.
associated to this data store.
type: string
type: object
type: object
Expand Down
2 changes: 1 addition & 1 deletion config/tests/samples/create/samples.go
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ func updateProjectResourceWithExistingResourceIDs(t *testing.T, unstructs []*uns
if err != nil {
t.Fatalf("error getting billingAccountRef: %v", err)
}
// We cannot dynamically create GCP project with billingAccountRef, acquring pre-created project instead.
// We cannot dynamically create GCP project with billingAccountRef, acquiring pre-created project instead.
if found && b != "" {
annotations := u.GetAnnotations()
if annotations == nil {
Expand Down
2 changes: 1 addition & 1 deletion crds/compute_v1beta1_computeinstancegroupmanager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ spec:
recreating:
description: '[Output Only] The number of instances in the managed
instance group that are scheduled to be recreated or are currently
being being recreated. Recreating an instance deletes the existing
being recreated. Recreating an instance deletes the existing
root persistent disk and creates a new disk from the image that
is defined in the instance template.'
format: int64
Expand Down
2 changes: 1 addition & 1 deletion crds/container_v1beta1_containercluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ spec:
type: object
type: array
gcpPublicCidrsAccessEnabled:
description: Whether master is accessbile via Google Compute Engine
description: Whether master is accessible via Google Compute Engine
Public IP addresses.
type: boolean
type: object
Expand Down
2 changes: 1 addition & 1 deletion crds/vertexai_v1alpha1_vertexaifeaturestoreentitytype.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ spec:
type: string
state:
description: |-
Whether to enable / disable / inherite default hebavior for import features analysis. The value must be one of the values below:
Whether to enable / disable / inherite default behavior for import features analysis. The value must be one of the values below:
* DEFAULT: The default behavior of whether to enable the monitoring. EntityType-level config: disabled.
* ENABLED: Explicitly enables import features analysis. EntityType-level config: by default enables import features analysis for all Features under it.
* DISABLED: Explicitly disables import features analysis. EntityType-level config: by default disables import features analysis for all Features under it.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func (u *TypeUpdater) Run() error {
return nil
}

// anaylze finds the new field, its parent message, and all dependent messages that need to be generated.
// analyze finds the new field, its parent message, and all dependent messages that need to be generated.
func (u *TypeUpdater) analyze() error {
parentMessage, newField, err := findNewField(u.opts.ProtoSourcePath, u.opts.parentMessageFullName, u.opts.newField)
if err != nil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ The `status.externalRef` shall use the [cloud asset inventory](https://cloud.go

### Backward compatibiltiy for TF/DCL based reconcilers

The existing TF-based and DCL-based reconciliation treats the `spec.resourceID` as the single Source of Truth to identify a GCP resource. It writes back the `spec.resourceID` after reconciliation. Here are [the known problems](/~https://github.com/GoogleCloudPlatform/k8s-config-connector/issues/2765). Config Connector will keep the bahavior of these resources, until they are migrated to the Direct reconciler.
The existing TF-based and DCL-based reconciliation treats the `spec.resourceID` as the single Source of Truth to identify a GCP resource. It writes back the `spec.resourceID` after reconciliation. Here are [the known problems](/~https://github.com/GoogleCloudPlatform/k8s-config-connector/issues/2765). Config Connector will keep the behavior of these resources, until they are migrated to the Direct reconciler.

<!-- Footnotes themselves at the bottom. -->

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ For example, the `computeForwardingRule` has the `ComputeAddress` reference whic

### Rule 1

We will continue supporting the existing bebavior when migrating to the Direct Resource.
We will continue supporting the existing behavior when migrating to the Direct Resource.


### Rule 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ reference:

## Abandon chioce

We should allow the choice to abandon the expanded resources when the Input API is deleted. This could be done via an annotaton on the Input API object.
We should allow the choice to abandon the expanded resources when the Input API is deleted. This could be done via an annotation on the Input API object.

## POC decisions

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,9 @@ func (r *ExpanderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
_, exist := inputcr.GetAnnotations()["composition-expander-debug-logs"]
if exist {
expanderDebugLogsEnabled = true
logger.Info("annotation'composition-expander-debug-logs' is turned on.")
logger.Info("annotation 'composition-expander-debug-logs' is turned on.")
}
logger.Info("annotation'composition-expander-debug-logs' is turned off.")
logger.Info("annotation 'composition-expander-debug-logs' is turned off.")

// Write out the (in-order) stages to the plan as a reference for later when we need to delete resources.
stagesEvaluated := []string{}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ gcloud iam service-accounts add-iam-policy-binding ${TEAM_GSA_EMAIL} \
--condition None
```

## Grant ASO permission for the GCP service accout used by this team
## Grant ASO permission for the GCP service account used by this team

This step follows the [following documentation](setup-Azure-ASO.md#create-a-gcp-service-account)
```
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Set up Azure Service Operator v2 (ASO)

Note: ASO support is only availabe for GCP managed [Config
Note: ASO support is only available for GCP managed [Config
Connector](https://cloud.google.com/config-connector/docs/overview).

Here is an overview of the ASO setup process:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Set up AWS Controllers for Kubernetes (ACK)

Note: ACK support is only availabe for GCP managed [Config
Note: ACK support is only available for GCP managed [Config
Connector](https://cloud.google.com/config-connector/docs/overview).

Here is an overview of the ACK setup process:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ metadata:
name: configconnector.core.cnrm.cloud.google.com
spec:
mode: cluster
# Replace ${GSA?} with your service account's name and and ${PROJECT_ID?} with your project ID.
# Replace ${GSA?} with your service account's name and ${PROJECT_ID?} with your project ID.
googleServiceAccount: "${GSA?}@${PROJECT_ID?}.iam.gserviceaccount.com"
2 changes: 1 addition & 1 deletion operator/config/samples/configconnectorcontext_sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ kind: ConfigConnectorContext
metadata:
name: configconnectorcontext.core.cnrm.cloud.google.com
spec:
# Replace ${GSA?} with your service account's name and and ${PROJECT_ID?} with your project ID.
# Replace ${GSA?} with your service account's name and ${PROJECT_ID?} with your project ID.
googleServiceAccount: "${GSA?}@${PROJECT_ID?}.iam.gserviceaccount.com"
2 changes: 1 addition & 1 deletion operator/scripts/update-kcc-manifest/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ func kustomizeBuild(operatorSrcRoot string) {
buildPath = path.Join(operatorSrcRoot, baseDir, "kcc", "install-bundle-namespaced")
buildNamespacedMode(operatorSrcRoot, buildPath, output, false)

// autpilot namespaced mode
// autopilot namespaced mode
buildPath = path.Join(operatorSrcRoot, baseDir, "kcc", "install-bundle-autopilot-namespaced")
buildNamespacedMode(operatorSrcRoot, buildPath, output, true)
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ func (a *gkeHubAdapter) Update(ctx context.Context, updateOp *directbase.UpdateO
log := klog.FromContext(ctx).WithName(ctrlName)
log.V(2).Info("updating object", "u", u)
actual := a.actual.MembershipSpecs[a.membershipID]
// There are no output fields in the api Object, so we can compare the desired and the actaul directly.
// There are no output fields in the api Object, so we can compare the desired and the actual directly.
if !reflect.DeepEqual(a.desired.Configmanagement, actual.Configmanagement) || !reflect.DeepEqual(a.desired.Policycontroller, actual.Policycontroller) || !reflect.DeepEqual(a.desired.Mesh, actual.Mesh) {
log.V(2).Info("diff detected, patching gkehubfeaturemembership")
if _, err := a.patchMembershipSpec(ctx); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/direct/sql/sqlinstance_defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func ApplySQLInstanceGCPDefaults(in *krm.SQLInstance, out *api.DatabaseInstance,
out.Settings.AuthorizedGaeApplications = make([]string, 0)
}
if in.Spec.Settings.AvailabilityType == nil {
// GCP default AvailailbilityType is ZONAL.
// GCP default AvailabilityType is ZONAL.
out.Settings.AvailabilityType = "ZONAL"
}
if in.Spec.Settings.BackupConfiguration == nil && actual != nil && !actual.Settings.BackupConfiguration.Enabled {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/resourceactuation/resourceactuation.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func DecideActuationMode(cc opv1beta1.ConfigConnector, ccc opv1beta1.ConfigConne
return opv1beta1.DefaultActuationMode()
}

// ShouldSkip skips a resource actuatation if the ReconcileIntervalInSecondsAnnotation = 0 and the KRM resource has not changed since its last UpToDate.
// ShouldSkip skips a resource actuation if the ReconcileIntervalInSecondsAnnotation = 0 and the KRM resource has not changed since its last UpToDate.
// This will disable drift correction on corresponding GCP resources since the reconcileInterval is set to 0.
func ShouldSkip(u *unstructured.Unstructured) (bool, error) {
generation, found, err := unstructured.NestedInt64(u.Object, "metadata", "generation")
Expand Down
2 changes: 1 addition & 1 deletion pkg/k8s/meta.go
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ func GetContainerAnnotation(annotations map[string]string, containerTypes []core
continue
}
if found {
return "", "", fmt.Errorf("ambiguious container annotation: found for %v and %v", containerType, c)
return "", "", fmt.Errorf("ambiguous container annotation: found for %v and %v", containerType, c)
}
containerVal = val
containerType = c
Expand Down
2 changes: 1 addition & 1 deletion pkg/ready/ready.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var ready = false

// SetContainerAsReady sets up an HTTP server for the readiness probe to check
func SetContainerAsReady() {
// Avoid starting up another HTTP server if we had alread started one to
// Avoid starting up another HTTP server if we had already started one to
// avoid a port conflict error which would cause an application crash due
// to the logging.Fatal() call below.
if ready {
Expand Down
2 changes: 1 addition & 1 deletion pkg/test/controller/reconcile.go
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ tryAgain:
return nil
}

return fmt.Errorf("cannot set project id annotatation value to %q: the annotation already contained a value of %q", projectID, val)
return fmt.Errorf("cannot set project id annotation value to %q: the annotation already contained a value of %q", projectID, val)
}
k8s.SetAnnotation(k8s.ProjectIDAnnotation, projectID, &ns)
err := c.Update(ctx, &ns)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ kind: GKEHubFeature
metadata:
name: gkehubfeature-basic-acm-${uniqueId}
annotations:
# Abondon the feature resource as it is global within a project and we would hit issues when running two tests in parallel.
# Abandon the feature resource as it is global within a project and we would hit issues when running two tests in parallel.
cnrm.cloud.google.com/deletion-policy: "abandon"
spec:
projectRef:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ kind: GKEHubFeature
metadata:
name: gkehubfeature-full-acm-${uniqueId}
annotations:
# Abondon the feature resource as it is global within a project and we would hit issues when running two tests in parallel.
# Abandon the feature resource as it is global within a project and we would hit issues when running two tests in parallel.
cnrm.cloud.google.com/deletion-policy: "abandon"
spec:
projectRef:
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/script_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ func TestE2EScript(t *testing.T) {
t.Fatalf("timed out looking for value %s in http log", sval)
stopWaiting = true
case <-ticker.C:
// todo(acpana): find better asympotatic approach
// todo(acpana): find better asymptotic approach
for _, l := range h.Events.HTTPEvents {
if strings.Contains(l.Response.Body, sval) {
stopWaiting = true
Expand Down
Loading