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 7/n #3215

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ TEST_TARGET ?= mock
e2e-sample-tests:
RUN_E2E=1 E2E_KUBE_TARGET=envtest E2E_GCP_TARGET=${TEST_TARGET} KCC_USE_DIRECT_RECONCILERS="ComputeForwardingRule" \ go test -test.count=1 -timeout 3600s -v ./tests/e2e -run ${SAMPLE_TESTCASE}

# orgnization ID for google.com
# organization ID for google.com
ORG_ID ?= 433637338589
# billing account for ACP
BILLING_ACCOUNT ?= 010E8D-490B6B-088E1C
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ type DiscoveryEngineDataStoreObservedState struct {

// +genclient
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// TODO(user): make sure the pluralizaiton below is correct
// TODO(user): make sure the pluralization below is correct
// +kubebuilder:resource:categories=gcp,shortName=gcpdiscoveryenginedatastore;gcpdiscoveryenginedatastores
// +kubebuilder:subresource:status
// +kubebuilder:metadata:labels="cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/system=true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ insertText: |
\${3:oncall-treatment}: \${4:stay-aware}
name: \${5:monitoringalertpolicy-name}
spec:
displayName: \${6:Sample Website Aetwork Connectivity Alert Policy}
displayName: \${6:Sample Website Network Connectivity Alert Policy}
enabled: \${7:true}
notificationChannels:
- name: \${8:monitoringalertpolicy-dep1-networkconnectivity}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
oncall-treatment: stay-aware
name: monitoringalertpolicy-sample-networkconnectivity
spec:
displayName: Sample Website Aetwork Connectivity Alert Policy
displayName: Sample Website Network Connectivity Alert Policy
enabled: true
notificationChannels:
- name: monitoringalertpolicy-dep1-networkconnectivity
Expand Down
4 changes: 2 additions & 2 deletions crds/cloudfunctions2_v1alpha1_cloudfunctions2function.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ spec:
description: Name of the environment variable.
type: string
projectId:
description: Project identifier (preferrably project number
description: Project identifier (preferably project number
but can also be the project ID) of the project that contains
the secret. If not set, it will be populated with the
function's project assuming that the secret exists in
Expand Down Expand Up @@ -354,7 +354,7 @@ spec:
mount path: /etc/secrets.'
type: string
projectId:
description: Project identifier (preferrably project number
description: Project identifier (preferably project number
but can also be the project ID) of the project that contains
the secret. If not set, it will be populated with the
function's project assuming that the secret exists in
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 @@ -1450,7 +1450,7 @@ spec:
type: object
type: object
nodePoolDefaults:
description: The default nodel pool settings for the entire cluster.
description: The default node pool settings for the entire cluster.
properties:
nodeConfigDefaults:
description: Subset of NodeConfig message that has defaults.
Expand Down
6 changes: 3 additions & 3 deletions crds/healthcare_v1alpha1_healthcarefhirstore.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ spec:
data types will not be parsed. New stores will have this value set
to ENABLED by default after a notification period. Warning: turning
on this flag causes processing existing resources to fail if they
contain references to non-existent resources. Possible values: ["COMPLEX_DATA_TYPE_REFERENCE_PARSING_UNSPECIFIED",
contain references to nonexistent resources. Possible values: ["COMPLEX_DATA_TYPE_REFERENCE_PARSING_UNSPECIFIED",
"DISABLED", "ENABLED"].'
type: string
dataset:
Expand Down Expand Up @@ -129,7 +129,7 @@ spec:
description: |-
Whether this FHIR store has the updateCreate capability. This determines if the client can use an Update
operation to create a new resource with a client-specified ID. If false, all IDs are server-assigned through
the Create operation and attempts to Update a non-existent resource will return errors. Please treat the audit
the Create operation and attempts to Update a nonexistent resource will return errors. Please treat the audit
logs with appropriate levels of care if client-specified resource IDs contain sensitive data such as patient
identifiers, those IDs will be part of the FHIR resource path recorded in Cloud audit logs and Cloud Pub/Sub
notifications.
Expand All @@ -150,7 +150,7 @@ spec:
- pubsubTopic
type: object
notificationConfigs:
description: A list of notifcation configs that configure the notification
description: A list of notification configs that configure the notification
for every resource mutation in this FHIR store.
items:
properties:
Expand Down
2 changes: 1 addition & 1 deletion crds/run_v1beta1_runjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@ spec:
type: integer
expireTime:
description: For a deleted resource, the time after which it will
be permamently deleted.
be permanently deleted.
type: string
lastModifier:
description: Email address of the last authenticated modifier.
Expand Down
2 changes: 1 addition & 1 deletion crds/run_v1beta1_runservice.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@ spec:
type: string
expireTime:
description: For a deleted resource, the time after which it will
be permamently deleted.
be permanently deleted.
type: string
lastModifier:
description: Email address of the last authenticated modifier.
Expand Down
2 changes: 1 addition & 1 deletion dev/tools/controllerbuilder/template/apis/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ type {{ .Kind }}ObservedState struct {

// +genclient
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// TODO(user): make sure the pluralizaiton below is correct
// TODO(user): make sure the pluralization below is correct
// +kubebuilder:resource:categories=gcp,shortName=gcp{{ .Kind | ToLower }};gcp{{ .Kind | ToLower }}s
// +kubebuilder:subresource:status
// +kubebuilder:metadata:labels="cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/system=true"
Expand Down
2 changes: 1 addition & 1 deletion docs/develop-resources/api-conventions/validations.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ If the field contains more complicated GCP behavior, for example the GCP server

Parent field should be required and immutable.

Note that parent is not a field name. It refers to the pre-requisite of the resource in question. You can identify the parent field through to the cloud resource's parent segment in the URL. For example, for GKE clusters, the [GET request URL](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1/projects.zones.clusters/get) `https://container.googleapis.com/v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}` has `projectId` and `zone` in the parent segment. Therefore, for GKE clusters, projectRef and zone will be the parent fields.
Note that parent is not a field name. It refers to the prerequisite of the resource in question. You can identify the parent field through to the cloud resource's parent segment in the URL. For example, for GKE clusters, the [GET request URL](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1/projects.zones.clusters/get) `https://container.googleapis.com/v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}` has `projectId` and `zone` in the parent segment. Therefore, for GKE clusters, projectRef and zone will be the parent fields.


### Required
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Follow [deep-dives Step 1](../deep-dives/1-add-mockgcp-tests.md). We use the Ter

* The 1st git-commit shall contain `create.yaml` and `update.yaml` files with exactly the same config.
* The 2nd git-commit shall have `update.yaml` changing all the mutable fields, reflected in the git-diff based on the first commit.
* The 3rd git-commit (or N-th git-commit) shall run against real GCP. The generated `_generated_object_<resource>.golden.yaml` and `_http.log` is the golden log reflecting the real GCP. The `_generated_obeject_<resource>.golden.yaml` matches the `spec` in `update.yaml`
* The 3rd git-commit (or N-th git-commit) shall run against real GCP. The generated `_generated_object_<resource>.golden.yaml` and `_http.log` is the golden log reflecting the real GCP. The `_generated_object_<resource>.golden.yaml` matches the `spec` in `update.yaml`
* The 4rd git-commit (or N+1-th git-commit) shall run against the Mock GCP. The git-diff shows `_generated_object_<resource>.golden.yaml` is unchanged, and the `_http.log` is as much like the real GCP as possible.

* If the resource has dependencies (`dependencies.yaml`), we should cover all the referenced fields. If the dependency resource does not have mockGCP, you need to implement those dependencies' MockGCP methods as well.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ spec:
# it is recommended to ensure that all your Pods/Containers are restrictive.
# More info: https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted
# Please uncomment the following code if your project does NOT have to work on old Kubernetes
# versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. Openshift < 4.11 ).
# versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. OpenShift < 4.11 ).
# seccompProfile:
# type: RuntimeDefault
containers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
# it is recommended to ensure that all your Pods/Containers are restrictive.
# More info: https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted
# Please uncomment the following code if your project does NOT have to work on old Kubernetes
# versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. Openshift < 4.11 ).
# versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. OpenShift < 4.11 ).
# seccompProfile:
# type: RuntimeDefault
containers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ spec:
# it is recommended to ensure that all your Pods/Containers are restrictive.
# More info: https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted
# Please uncomment the following code if your project does NOT have to work on old Kubernetes
# versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. Openshift < 4.11 ).
# versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. OpenShift < 4.11 ).
# seccompProfile:
# type: RuntimeDefault
containers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
# it is recommended to ensure that all your Pods/Containers are restrictive.
# More info: https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted
# Please uncomment the following code if your project does NOT have to work on old Kubernetes
# versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. Openshift < 4.11 ).
# versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. OpenShift < 4.11 ).
# seccompProfile:
# type: RuntimeDefault
containers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
# it is recommended to ensure that all your Pods/Containers are restrictive.
# More info: https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted
# Please uncomment the following code if your project does NOT have to work on old Kubernetes
# versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. Openshift < 4.11 ).
# versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. OpenShift < 4.11 ).
# seccompProfile:
# type: RuntimeDefault
containers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ spec:
# it is recommended to ensure that all your Pods/Containers are restrictive.
# More info: https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted
# Please uncomment the following code if your project does NOT have to work on old Kubernetes
# versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. Openshift < 4.11 ).
# versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. OpenShift < 4.11 ).
# seccompProfile:
# type: RuntimeDefault
containers:
Expand Down
2 changes: 1 addition & 1 deletion experiments/compositions/samples/Eventarc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This configuration utilizes KCC's `GetterConfiguration` and `Context` API to imp
* **Context API (`Context`)**

The Context API provides a way to define contextual information, such as the project ID, that can be accessed by the composition. This avoids redundant specification of the project ID for each resource and promotes centralized configuration management.
*Note that in the `config-control` namespace, the Context API is pre-populated.*
*Note that in the `config-control` namespace, the Context API is prepopulated.*

**Deployment Steps**

Expand Down
2 changes: 1 addition & 1 deletion experiments/kompanion/cmd/export/export.go
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ func RunExport(ctx context.Context, opts *ExportOptions) error {
// create the work log for go routine workers to use
q := &taskQueue{}

// Parallize across resources, unless we are scoped to a few namespaces
// Parallelize across resources, unless we are scoped to a few namespaces
// The thought is that if users target a particular namespace (or a few), they may not have cluster-wide permission.
perNamespace := len(opts.targetNamespaces) > 0
if perNamespace {
Expand Down
2 changes: 1 addition & 1 deletion mockgcp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ and it normally logs an error like "foo not set" (in this case, simply add that

### Generating proto

If the proto file on [googleapis](https://github.com/googleapis/googleapis/commits/1e4137870560340a14700618a05e2d7162326af7/google/cloud/ids/v1/ids.proto) is out of date or non existent, you can generate a proto file from the [google generated api](https://github.com/googleapis/google-api-go-client/tree/b49e3b908a8ed562e068736f1c42e992538ba6e0) as such:
If the proto file on [googleapis](https://github.com/googleapis/googleapis/commits/1e4137870560340a14700618a05e2d7162326af7/google/cloud/ids/v1/ids.proto) is out of date or nonexistent, you can generate a proto file from the [google generated api](https://github.com/googleapis/google-api-go-client/tree/b49e3b908a8ed562e068736f1c42e992538ba6e0) as such:

```shell
$ wget -O ids-api-v1.json https://raw.githubusercontent.com/googleapis/google-api-go-client/b49e3b908a8ed562e068736f1c42e992538ba6e0/ids/v1/ids-api.json
Expand Down
2 changes: 1 addition & 1 deletion mockgcp/apis/mockgcp/cloud/kms/v1/service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ message ImportCryptoKeyVersionRequest {
optional bytes wrapped_key = 5 [json_name="wrappedKey"];
}

// An ImportJob can be used to create CryptoKeys and CryptoKeyVersions using pre-existing key material, generated outside of Cloud KMS. When an ImportJob is created, Cloud KMS will generate a "wrapping key", which is a public/private key pair. You use the wrapping key to encrypt (also known as wrap) the pre-existing key material to protect it during the import process. The nature of the wrapping key depends on the choice of import_method. When the wrapping key generation is complete, the state will be set to ACTIVE and the public_key can be fetched. The fetched public key can then be used to wrap your pre-existing key material. Once the key material is wrapped, it can be imported into a new CryptoKeyVersion in an existing CryptoKey by calling ImportCryptoKeyVersion. Multiple CryptoKeyVersions can be imported with a single ImportJob. Cloud KMS uses the private key portion of the wrapping key to unwrap the key material. Only Cloud KMS has access to the private key. An ImportJob expires 3 days after it is created. Once expired, Cloud KMS will no longer be able to import or unwrap any key material that was wrapped with the ImportJob's public key. For more information, see [Importing a key](https://cloud.google.com/kms/docs/importing-a-key).
// An ImportJob can be used to create CryptoKeys and CryptoKeyVersions using preexisting key material, generated outside of Cloud KMS. When an ImportJob is created, Cloud KMS will generate a "wrapping key", which is a public/private key pair. You use the wrapping key to encrypt (also known as wrap) the pre-existing key material to protect it during the import process. The nature of the wrapping key depends on the choice of import_method. When the wrapping key generation is complete, the state will be set to ACTIVE and the public_key can be fetched. The fetched public key can then be used to wrap your pre-existing key material. Once the key material is wrapped, it can be imported into a new CryptoKeyVersion in an existing CryptoKey by calling ImportCryptoKeyVersion. Multiple CryptoKeyVersions can be imported with a single ImportJob. Cloud KMS uses the private key portion of the wrapping key to unwrap the key material. Only Cloud KMS has access to the private key. An ImportJob expires 3 days after it is created. Once expired, Cloud KMS will no longer be able to import or unwrap any key material that was wrapped with the ImportJob's public key. For more information, see [Importing a key](https://cloud.google.com/kms/docs/importing-a-key).
message ImportJob {
// Output only. Statement that was generated and signed by the key creator (for example, an HSM) at key creation time. Use this statement to verify attributes of the key as stored on the HSM, independently of Google. Only present if the chosen ImportMethod is one with a protection level of HSM.
optional KeyOperationAttestation attestation = 1 [json_name="attestation"];
Expand Down
4 changes: 2 additions & 2 deletions mockgcp/mockresourcemanager/folders.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func (s *Folders) GetFolder(ctx context.Context, req *pb.GetFolderRequest) (*pb.
return nil, err
}

// We should verify that this is part of on of our projects, but ... it's a mock
// We should verify that this is part of one of our projects, but ... it's a mock

return obj, nil
}
Expand Down Expand Up @@ -183,7 +183,7 @@ func (s *Folders) DeleteFolder(ctx context.Context, req *pb.DeleteFolderRequest)
return nil, err
}

// We should verify that this is part of on of our projects, but ... it's a mock
// We should verify that this is part of one of our projects, but ... it's a mock
lro, err := s.operations.DoneLRO(ctx, "", nil, obj)
if err != nil {
return nil, err
Expand Down
6 changes: 3 additions & 3 deletions mockgcp/mockresourcemanager/tagkeys.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (s *TagKeys) GetTagKey(ctx context.Context, req *pb.GetTagKeyRequest) (*pb.
return nil, err
}

// We should verify that this is part of on of our projects, but ... it's a mock
// We should verify that this is part of one of our projects, but ... it's a mock

return obj, nil
}
Expand Down Expand Up @@ -127,7 +127,7 @@ func (s *TagKeys) UpdateTagKey(ctx context.Context, req *pb.UpdateTagKeyRequest)
return nil, err
}

// We should verify that this is part of on of our projects, but ... it's a mock
// We should verify that this is part of one of our projects, but ... it's a mock

// Fields to be updated. The mask may only contain `description` or
// `etag`. If omitted entirely, both `description` and `etag` are assumed to
Expand Down Expand Up @@ -163,7 +163,7 @@ func (s *TagKeys) DeleteTagKey(ctx context.Context, req *pb.DeleteTagKeyRequest)

fqn := name.String()

// We should verify that this is part of on of our projects, but ... it's a mock
// We should verify that this is part of one of our projects, but ... it's a mock
metadata := &pb.DeleteTagKeyMetadata{}
return s.operations.StartLRO(ctx, "", metadata, func() (proto.Message, error) {
// TagKey must not have any child TagValues
Expand Down
Loading
Loading