Skip to content

Commit

Permalink
Merge pull request #3207 from jsoref/spelling-4
Browse files Browse the repository at this point in the history
[CHORE] Spelling 4/n
  • Loading branch information
google-oss-prow[bot] authored Nov 20, 2024
2 parents bd9c504 + bc359d3 commit c1bdc7d
Show file tree
Hide file tree
Showing 122 changed files with 126 additions and 126 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ repo to quickly set up a local dev environment.
The script `gcp-setup.sh` annotates your `default` namespace in the GKE cluster
with a
[project-id](https://cloud.google.com/config-connector/docs/how-to/organizing-resources/project-scoped-resources#annotate_namespace_configuration)
annotation equals to your default GCP project id in gcloud. This enables Config
annotation equal to your default GCP project id in gcloud. This enables Config
Connector to create GCP resources in that default GCP project. We can validate
by creating an Artifact Registry resource through Config Connector.
Expand Down
2 changes: 1 addition & 1 deletion apis/dataflow/v1beta1/flextemplatejob_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ type DataflowFlexTemplateJobObservedState struct {
// Flexible resource scheduling jobs are started with some delay after job
// creation, so start_time is unset before start and is updated when the
// job is started by the Cloud Dataflow service. For other jobs, start_time
// always equals to create_time and is immutable and set by the Cloud Dataflow
// always equals create_time and is immutable and set by the Cloud Dataflow
// service.
StartTime *string `json:"startTime,omitempty"`
Expand Down
2 changes: 1 addition & 1 deletion apis/dataflow/v1beta1/types.generated.go

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

2 changes: 1 addition & 1 deletion crds/container_v1beta1_containercluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1716,7 +1716,7 @@ spec:
field will not be blocked.
properties:
enabled:
description: When enabled, services with exterenal ips specified
description: When enabled, services with external ips specified
will be allowed.
type: boolean
required:
Expand Down
2 changes: 1 addition & 1 deletion crds/dialogflowcx_v1alpha1_dialogflowcxflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ spec:
They are responsible for matching the user's first utterances in the flow.
They are inherited by every page's [transition routes][Page.transition_routes] and can support use cases such as the user saying "help" or "can I talk to a human?", which can be handled in a common way regardless of the current page. Transition routes defined in the page have higher priority than those defined in the flow.
TransitionRoutes are evalauted in the following order:
TransitionRoutes are evaluated in the following order:
TransitionRoutes with intent specified.
TransitionRoutes with only condition specified.
TransitionRoutes with intent specified are inherited by pages in the flow.
Expand Down
2 changes: 1 addition & 1 deletion crds/dialogflowcx_v1alpha1_dialogflowcxpage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@ spec:
transitionRoutes:
description: |-
A list of transitions for the transition rules of this page. They route the conversation to another page in the same flow, or another flow.
When we are in a certain page, the TransitionRoutes are evalauted in the following order:
When we are in a certain page, the TransitionRoutes are evaluated in the following order:
TransitionRoutes defined in the page with intent specified.
TransitionRoutes defined in the transition route groups with intent specified.
TransitionRoutes defined in flow with intent specified.
Expand Down
2 changes: 1 addition & 1 deletion crds/eventarc_v1beta1_eventarctrigger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ spec:
description: An HTTP endpoint destination described by an URI.
properties:
uri:
description: 'Required. The URI of the HTTP enpdoint. The
description: 'Required. The URI of the HTTP endpoint. The
value must be a RFC2396 URI string. Examples: `http://10.10.10.8:80/route`,
`http://svc.us-central1.p.local:8080/`. Only HTTP and HTTPS
protocols are supported. The host can be either a static
Expand Down
2 changes: 1 addition & 1 deletion crds/networkservices_v1beta1_networkservicestlsroute.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ spec:
type: object
weight:
description: 'Optional. Specifies the proportion of
requests forwareded to the backend referenced by
requests forwarded to the backend referenced by
the service_name field. This is computed as: weight/Sum(weights
in destinations) Weights in all destinations does
not need to sum up to 100.'
Expand Down
2 changes: 1 addition & 1 deletion crds/osconfig_v1beta1_osconfigguestpolicy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ spec:
type: string
osVersion:
description: Targets VM instances with OS Inventory enabled
and having the following following OS version.
and having the following OS version.
type: string
type: object
type: array
Expand Down
2 changes: 1 addition & 1 deletion dev/tools/controllerbuilder/pkg/codegen/typegenerator.go
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ func findDependenciesForMessage(message protoreflect.MessageDescriptor) ([]proto
msgs := make(map[string]protoreflect.MessageDescriptor)
for i := 0; i < message.Fields().Len(); i++ {
field := message.Fields().Get(i)
FindDependenciesForField(field, msgs, nil) // TODO: explicity set ignored fields when generating Go types
FindDependenciesForField(field, msgs, nil) // TODO: explicitly set ignored fields when generating Go types
}

RemoveNotMappedToGoStruct(msgs)
Expand Down
2 changes: 1 addition & 1 deletion docs/develop-resources/deep-dives/1-add-mockgcp-tests.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ MockGCP test is required for the direct resource development.
Create a directory for your resource [pkg/test/resourcefixture/testdata/basic](pkg/test/resourcefixture/testdata/basic), following the naming convention as other directories. The bottommost directory name is the test suite name. You can create as many directory as your test needs.

Just to add the `create.yaml`, `update.yaml` and `dependencies.yaml` (if applicable) to each bottommost directory.
These three files are all Kubernetes config files, excep that `create.yaml` and `update.yaml` only holds the your Config Connector CR object, and the `dependencies.yaml` holds all the dependent objects.
These three files are all Kubernetes config files, except that `create.yaml` and `update.yaml` only holds the your Config Connector CR object, and the `dependencies.yaml` holds all the dependent objects.

## 1.2 Write the MockGCP server

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ The PR adds the direct mapper. You can do this together with the previous step o

Follow [deep-dives Step 4](../deep-dives/4-add-controller.md).

* Use the `KCC_USE_DIRECT_RECONCILERS` flag [exampe](https://github.com/GoogleCloudPlatform/k8s-config-connector/blob/0bbac86ace6ab2f4051b574f026d5fe47fa05b75/dev/tasks/run-e2e#L27).
* Use the `KCC_USE_DIRECT_RECONCILERS` flag [example](https://github.com/GoogleCloudPlatform/k8s-config-connector/blob/0bbac86ace6ab2f4051b574f026d5fe47fa05b75/dev/tasks/run-e2e#L27).

*Tips* The `KCC_USE_DIRECT_RECONCILERS` will override the `tf2crd` and `dcl2crd` label to force using the direct controller, but it will not affect the releases which will still use the Terraform/DCL based controllers until the Direct controller is fully ready. This allows developing the API and controller in different Config Connector releases without code freeze.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ We would need to build an intrerface on top of the manager that supports checkin
controller-runtime's Manager interface provides no way to `Stop` or `Remove` a runnable. In fact it does not even track the runnables for a given group. During `Add()` a go routine is created and thats it. A shared cancellable context is used across multiple reconcilers.

## Impact for Allotrope
- With naive controller-runtime library we end up starting multiple reconcilers for the same Input GVK everytime the Composition object changes.
- With naive controller-runtime library we end up starting multiple reconcilers for the same Input GVK every time the Composition object changes.
- Without stop support we cannot stop the Input GVK controller when a Composition object is deleted.


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ func (g *Getter) GetValues() map[string]interface{} {

// ------------- GRPC Server implementation ----------------

// server is used to implement exander.Evaluator
// server is used to implement expander.Evaluator
type grpcServer struct {
pb.UnimplementedExpanderServer
dynamicClient dynamic.Interface
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var (
port = flag.Int("port", 8443, "The server port")
)

// server is used to implement exander.Evaluator
// server is used to implement expander.Evaluator
type server struct {
pb.UnimplementedExpanderServer
}
Expand Down
2 changes: 1 addition & 1 deletion experiments/compositions/expanders/cel-expander/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ func (e *Expander) Evaluate(result *pb.EvaluateResult) (*pb.EvaluateResult, erro

// ------------- GRPC Server implementation ----------------

// server is used to implement exander.Evaluator
// server is used to implement expander.Evaluator
type server struct {
pb.UnimplementedExpanderServer
}
Expand Down
2 changes: 1 addition & 1 deletion experiments/compositions/expanders/helm-expander/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ func (e *Expander) Evaluate(result *pb.EvaluateResult) (*pb.EvaluateResult, erro

// ------------- GRPC Server implementation ----------------

// server is used to implement exander.Evaluator
// server is used to implement expander.Evaluator
type server struct {
pb.UnimplementedExpanderServer
}
Expand Down
2 changes: 1 addition & 1 deletion mockgcp/mockspanner/admin/instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func (s *SpannerInstanceV1) CreateInstance(ctx context.Context, req *pb.CreateIn
func (s *SpannerInstanceV1) populateDefaultsForSpannerInstance(update, obj *pb.Instance) {
// At most one of either node_count or processing_units should be present.
// https://cloud.google.com/spanner/docs/compute-capacity
// 1 nodeCount equals to 1000 processingUnits
// 1 nodeCount equals 1000 processingUnits
if 1000*update.NodeCount > update.ProcessingUnits {
obj.ProcessingUnits = 1000 * update.NodeCount
obj.NodeCount = update.NodeCount
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/outputsink/sink_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ func testParentPathIsFileShouldError(t *testing.T, resourceFormat outputsink.Res
output := filepath.Join(f.Name(), "my-file")
sink, err := outputsink.New(tfprovider.NewOrLogFatal(tfprovider.UnitTestConfig()), output, resourceFormat)
if err == nil {
t.Fatalf("exepcted an error, instead got 'nil'")
t.Fatalf("expected an error, instead got 'nil'")
}
expectedMessage := fmt.Sprintf("cannot use output parameter '%v': parent path '%v' exists, but is not a directory",
output, f.Name())
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/direct/directbase/operations.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type operationBase struct {

object *unstructured.Unstructured

// HasSetReadyCondition tracks whether the controller explcitly set the ready condition
// HasSetReadyCondition tracks whether the controller explicitly set the ready condition
HasSetReadyCondition bool

// RequeueRequested tracks whether we need a re-reconciliation
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/direct/monitoring/changedetection.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (

// objectWithEtag holds the fields that are relevant to an etag-based change detection.
type objectWithEtag struct {
Status objectWithEtagtatus `json:"status"`
Status objectWithEtagStatus `json:"status"`
}

type objectWithEtagtatus struct {
type objectWithEtagStatus struct {
Conditions []v1alpha1.Condition `json:"conditions,omitempty"`

// Used if status.observedState.etag is not set
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/dynamic/dynamic_controller_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ func testUpdate(ctx context.Context, t *testing.T, testContext testrunner.TestCo
t.Fatalf("GCP resource has a nil spec even though it was created using a resource with a non-nil spec")
}
changedSpecFields := getChangedFields(initialUnstruct.Object, reconciledUnstruct.Object, "spec")
removeSensitiveFeilds(reconciledUnstruct, changedSpecFields) // remove sensitive fields which are reacted by the GCP API
removeSensitiveFields(reconciledUnstruct, changedSpecFields) // remove sensitive fields which are reacted by the GCP API
assertObjectContains(t, gcpUnstruct.Object["spec"].(map[string]interface{}), changedSpecFields)
}

Expand Down Expand Up @@ -890,7 +890,7 @@ func containsResourceIDTestVar(t *testing.T, u *unstructured.Unstructured) bool
return strings.Contains(string(b), resourceIDTestVar)
}

func removeSensitiveFeilds(unstruct *unstructured.Unstructured, changedSpecFields map[string]interface{}) {
func removeSensitiveFields(unstruct *unstructured.Unstructured, changedSpecFields map[string]interface{}) {
switch unstruct.GetKind() {
case "BigQueryDataTransferConfig":
// remove these fields which are reacted by the GCP API when reading.
Expand Down
4 changes: 2 additions & 2 deletions pkg/resourceoverrides/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func PreserveMutuallyExclusiveNonReferenceField(crd *apiextensions.CustomResourc
}
// TODO(b/223688758): Handle multiple oneOf rules.
if oneOfRule != nil {
return fmt.Errorf("can't handle multiple pairs of required mutually exclustive fields under %s for field %s and %s in CRD %s", parentPath, referenceFieldName, referenceFieldName, crd.Name)
return fmt.Errorf("can't handle multiple pairs of required mutually exclusive fields under %s for field %s and %s in CRD %s", parentPath, referenceFieldName, referenceFieldName, crd.Name)
}

oneOfRule = []*apiextensions.JSONSchemaProps{
Expand Down Expand Up @@ -164,7 +164,7 @@ func PreserveMutuallyExclusiveNonReferenceField(crd *apiextensions.CustomResourc
}
// TODO(b/223688758): Handle multiple not rules.
if notRule != nil {
return fmt.Errorf("can't handling multiple pairs of optional mutually exclustive fields for %s in %s", referenceFieldName, crd.Name)
return fmt.Errorf("can't handling multiple pairs of optional mutually exclusive fields for %s in %s", referenceFieldName, crd.Name)
}

notRule = &apiextensions.JSONSchemaProps{
Expand Down
2 changes: 1 addition & 1 deletion pkg/resourceskeleton/resourceskeleton.go
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ type iamCustomRoleID struct {
func parseIAMCustomRoleID(id string) (*iamCustomRoleID, error) {
partitions := strings.Split(id, "/")
if len(partitions) != 4 {
return nil, fmt.Errorf("expected 4 partitions split by '/' for for '%v'", id)
return nil, fmt.Errorf("expected 4 partitions split by '/' for '%v'", id)
}
value := iamCustomRoleID{
parentID: partitions[1],
Expand Down
2 changes: 1 addition & 1 deletion pkg/test/controller/k8s.go
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ func CollectEvents(t *testing.T, config *rest.Config, namespace string, expected
listOptions := metav1.ListOptions{}
watcher, err := clientSet.CoreV1().Events(namespace).Watch(context.Background(), listOptions)
if err != nil {
t.Fatalf("errror creating event watch: %v", err)
t.Fatalf("error creating event watch: %v", err)
}
defer watcher.Stop()
results := make([]v1.Event, 0)
Expand Down
4 changes: 2 additions & 2 deletions pkg/test/resourcefixture/contexts/dataflow_context.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ func init() {

resourceContextMap["streamingdataflowjobupdateparameters"] = ResourceContext{
ResourceKind: "DataflowJob",
// The streamingdataflowjob has been flakey, which seems to be attributed
// The streamingdataflowjob has been flaky, which seems to be attributed
// to the dataflow jobs themselves. see b/166669646
SkipUpdate: true,
}

resourceContextMap["streamingdataflowjobupdatetemplate"] = ResourceContext{
ResourceKind: "DataflowJob",
// The streamingdataflowjob has been flakey, which seems to be attributed
// The streamingdataflowjob has been flaky, which seems to be attributed
// to the dataflow jobs themselves. see b/166669646
SkipUpdate: true,
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
# Location preference is not actually a required field. However, setting it for tests
# helps with with normalizing the GCP responses, because otherwise GCP chooses a zone
# preference based on availability. Therefore it could potentially vary if not
# explicity specified.
# explicitly specified.
locationPreference:
zone: us-central1-a
tier: db-custom-1-3840
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
# Location preference is not actually a required field. However, setting it for tests
# helps with with normalizing the GCP responses, because otherwise GCP chooses a zone
# preference based on availability. Therefore it could potentially vary if not
# explicity specified.
# explicitly specified.
locationPreference:
zone: us-central1-a
tier: db-custom-1-3840
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
# Location preference is not actually a required field. However, setting it for tests
# helps with with normalizing the GCP responses, because otherwise GCP chooses a zone
# preference based on availability. Therefore it could potentially vary if not
# explicity specified.
# explicitly specified.
locationPreference:
zone: us-central1-a
tier: db-custom-1-3840
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
# Location preference is not actually a required field. However, setting it for tests
# helps with with normalizing the GCP responses, because otherwise GCP chooses a zone
# preference based on availability. Therefore it could potentially vary if not
# explicity specified.
# explicitly specified.
locationPreference:
zone: us-central1-a
tier: db-custom-1-3840
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
# Location preference is not actually a required field. However, setting it for tests
# helps with with normalizing the GCP responses, because otherwise GCP chooses a zone
# preference based on availability. Therefore it could potentially vary if not
# explicity specified.
# explicitly specified.
locationPreference:
zone: us-central1-a
sqlServerAuditConfig:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
# Location preference is not actually a required field. However, setting it for tests
# helps with with normalizing the GCP responses, because otherwise GCP chooses a zone
# preference based on availability. Therefore it could potentially vary if not
# explicity specified.
# explicitly specified.
locationPreference:
zone: us-central1-a
sqlServerAuditConfig:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
# Location preference is not actually a required field. However, setting it for tests
# helps with with normalizing the GCP responses, because otherwise GCP chooses a zone
# preference based on availability. Therefore it could potentially vary if not
# explicity specified.
# explicitly specified.
locationPreference:
zone: us-central1-a
sqlServerAuditConfig:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
# Location preference is not actually a required field. However, setting it for tests
# helps with with normalizing the GCP responses, because otherwise GCP chooses a zone
# preference based on availability. Therefore it could potentially vary if not
# explicity specified.
# explicitly specified.
locationPreference:
zone: us-central1-a
sqlServerAuditConfig:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
# Location preference is not actually a required field. However, setting it for tests
# helps with with normalizing the GCP responses, because otherwise GCP chooses a zone
# preference based on availability. Therefore it could potentially vary if not
# explicity specified.
# explicitly specified.
locationPreference:
zone: us-central1-a
tier: db-custom-1-3840
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
# Location preference is not actually a required field. However, setting it for tests
# helps with with normalizing the GCP responses, because otherwise GCP chooses a zone
# preference based on availability. Therefore it could potentially vary if not
# explicity specified.
# explicitly specified.
locationPreference:
zone: us-central1-a
tier: db-custom-1-3840
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
# Location preference is not actually a required field. However, setting it for tests
# helps with with normalizing the GCP responses, because otherwise GCP chooses a zone
# preference based on availability. Therefore it could potentially vary if not
# explicity specified.
# explicitly specified.
locationPreference:
zone: us-central1-a
tier: db-custom-1-3840
Loading

0 comments on commit c1bdc7d

Please sign in to comment.