diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 405e0c2f68..32d1ba9c2e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -114,7 +114,7 @@ repo to quickly set up a local dev environment. ./docker-setup.sh ``` -1. Exit your current session, then SSH back in to the VM. Then run the +1. Exit your current session, then SSH back into the VM. Then run the following to ensure you have set up sudoless docker correctly: ```shell diff --git a/README.ConfigureResourceReferences.md b/README.ConfigureResourceReferences.md index dc10f7cef7..5ffe74b5e3 100644 --- a/README.ConfigureResourceReferences.md +++ b/README.ConfigureResourceReferences.md @@ -62,7 +62,7 @@ Once it's determined, note down the field name and the referenced GCP resource n Before you can identify what the resource is based on, you must convert the Google Cloud resource name or Terraform type name into a -Config Connector kind name. Create a Github question in this repo for help +Config Connector kind name. Create a GitHub question in this repo for help if you still can't find the Config Connector kind name after following these steps: 1. If you know the TF type name, you can do project-scoped search in your local @@ -80,7 +80,7 @@ if you still can't find the Config Connector kind name after following these ste [KCC reference doc](https://cloud.google.com/config-connector/docs/reference/overview). 1. If you can't find a KCC kind with the steps above, it's possible that the - referenced resource is not supported in KCC. Create a Github question in this repo + referenced resource is not supported in KCC. Create a GitHub question in this repo to clarify. If you've determined that the KCC kind is not supported in KCC, skip ahead to [Configure reference resource in the service mappings](#configure-reference-in-the-service-mappings). @@ -119,10 +119,10 @@ You can find a `Type` field for each argument, and two most common types are 1. If the field is not required, mark it as an ignored field following [this example](https://github.com/GoogleCloudPlatform/k8s-config-connector/blob/b746248cd5a9b30669380513de8fdc6b4c43018d/config/servicemappings/cloudbuild.yaml#L204). - 1. If the field is required, create a Github question in this repo for + 1. If the field is required, create a GitHub question in this repo for further discussion. -1. If the field isn't a string or a list, create a Github question in this repo +1. If the field isn't a string or a list, create a GitHub question in this repo for further discussion. ## Configure reference resource in the service mappings diff --git a/apis/dataflow/v1beta1/types.generated.go b/apis/dataflow/v1beta1/types.generated.go index 32436dda3b..b49f472dd6 100644 --- a/apis/dataflow/v1beta1/types.generated.go +++ b/apis/dataflow/v1beta1/types.generated.go @@ -912,7 +912,7 @@ type PubsubLocation struct { // +kcc:proto=google.dataflow.v1beta3.RuntimeEnvironment type RuntimeEnvironment struct { - // The initial number of Google Compute Engine instnaces for the job. + // The initial number of Google Compute Engine instance for the job. NumWorkers *int32 `json:"numWorkers,omitempty"` // The maximum number of Google Compute Engine instances to be made diff --git a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_osconfigguestpolicies.osconfig.cnrm.cloud.google.com.yaml b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_osconfigguestpolicies.osconfig.cnrm.cloud.google.com.yaml index c50ed18865..86a02747b9 100644 --- a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_osconfigguestpolicies.osconfig.cnrm.cloud.google.com.yaml +++ b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_osconfigguestpolicies.osconfig.cnrm.cloud.google.com.yaml @@ -360,7 +360,7 @@ spec: type: string type: object id: - description: Required. Id of the artifact, which the installation + description: Required. ID of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id. type: string diff --git a/crds/container_v1beta1_containercluster.yaml b/crds/container_v1beta1_containercluster.yaml index e20a620437..786e8a2984 100644 --- a/crds/container_v1beta1_containercluster.yaml +++ b/crds/container_v1beta1_containercluster.yaml @@ -1491,7 +1491,7 @@ spec: properties: eventType: description: Can be used to filter what notifications - are sent. Valid values include include UPGRADE_AVAILABLE_EVENT, + are sent. Valid values include UPGRADE_AVAILABLE_EVENT, UPGRADE_EVENT and SECURITY_BULLETIN_EVENT. items: type: string diff --git a/crds/dns_v1beta1_dnsrecordset.yaml b/crds/dns_v1beta1_dnsrecordset.yaml index eb8f1513cb..9187343e53 100644 --- a/crds/dns_v1beta1_dnsrecordset.yaml +++ b/crds/dns_v1beta1_dnsrecordset.yaml @@ -110,7 +110,7 @@ spec: type: string routingPolicy: description: The configuration for steering traffic based on query. - You can specify either Weighted Round Robin(WRR) type or Geolocation(GEO) + You can specify either Weighted Round Robin(WRR) type or Geolocation (GEO) type. properties: enableGeoFencing: diff --git a/crds/networkservices_v1alpha1_networkservicesedgecacheservice.yaml b/crds/networkservices_v1alpha1_networkservicesedgecacheservice.yaml index bed11b5ba6..9d55149f41 100644 --- a/crds/networkservices_v1alpha1_networkservicesedgecacheservice.yaml +++ b/crds/networkservices_v1alpha1_networkservicesedgecacheservice.yaml @@ -610,7 +610,7 @@ spec: Defaults to 86400s (1 day). - Cache directives that attempt to set a max-age or s-maxage higher than this, or an Expires header more than maxTtl seconds in the future will be capped at the value of maxTTL, as if it were the value of an s-maxage Cache-Control directive. + Cache directives that attempt to set a max-age or s-maxage greater than this, or an Expires header more than maxTtl seconds in the future will be capped at the value of maxTTL, as if it were the value of an s-maxage Cache-Control directive. - The TTL must be >= 0 and <= 31,536,000 seconds (1 year) - Setting a TTL of "0" means "always revalidate" diff --git a/crds/osconfig_v1beta1_osconfigguestpolicy.yaml b/crds/osconfig_v1beta1_osconfigguestpolicy.yaml index a4b985cf0d..f7f2a3fbf9 100644 --- a/crds/osconfig_v1beta1_osconfigguestpolicy.yaml +++ b/crds/osconfig_v1beta1_osconfigguestpolicy.yaml @@ -373,7 +373,7 @@ spec: type: string type: object id: - description: Required. Id of the artifact, which the installation + description: Required. ID of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id. type: string diff --git a/crds/privateca_v1beta1_privatecacertificate.yaml b/crds/privateca_v1beta1_privatecacertificate.yaml index 2cf30231e1..8bbcd485f2 100644 --- a/crds/privateca_v1beta1_privatecacertificate.yaml +++ b/crds/privateca_v1beta1_privatecacertificate.yaml @@ -665,7 +665,7 @@ spec: type: object type: object subjectKeyId: - description: Provides a means of identifiying certificates that + description: Provides a means of identifying certificates that contain a particular public key, per https://tools.ietf.org/html/rfc5280#section-4.2.1.2. properties: keyId: diff --git a/crds/privateca_v1beta1_privatecacertificateauthority.yaml b/crds/privateca_v1beta1_privatecacertificateauthority.yaml index 88fc4211ae..c9b9c6d56a 100644 --- a/crds/privateca_v1beta1_privatecacertificateauthority.yaml +++ b/crds/privateca_v1beta1_privatecacertificateauthority.yaml @@ -702,7 +702,7 @@ spec: type: object type: object subjectKeyId: - description: Provides a means of identifiying certificates that + description: Provides a means of identifying certificates that contain a particular public key, per https://tools.ietf.org/html/rfc5280#section-4.2.1.2. properties: keyId: diff --git a/crds/vertexai_v1alpha1_vertexaifeaturestoreentitytype.yaml b/crds/vertexai_v1alpha1_vertexaifeaturestoreentitytype.yaml index 9633eebd8f..c8fe8bc84d 100644 --- a/crds/vertexai_v1alpha1_vertexaifeaturestoreentitytype.yaml +++ b/crds/vertexai_v1alpha1_vertexaifeaturestoreentitytype.yaml @@ -93,7 +93,7 @@ spec: value: description: Specify a threshold value that can trigger the alert. For categorical feature, the distribution distance - is calculated by L-inifinity norm. Each feature must have + is calculated by L-infinity norm. Each feature must have a non-zero threshold if they need to be monitored. Otherwise no alert will be triggered for that feature. The default value is 0.3. diff --git a/dev/tools/controllerbuilder/pkg/commands/updatetypes/updatetypescommand.go b/dev/tools/controllerbuilder/pkg/commands/updatetypes/updatetypescommand.go index a08bb7ed25..2b819c7b9f 100644 --- a/dev/tools/controllerbuilder/pkg/commands/updatetypes/updatetypescommand.go +++ b/dev/tools/controllerbuilder/pkg/commands/updatetypes/updatetypescommand.go @@ -112,7 +112,7 @@ type generatedGoField struct { type generatedGoStruct struct { name string // fully qualified name of the proto message - content []byte // the content of the genearted Go struct + content []byte // the content of the generated Go struct } func NewTypeUpdater(opts *UpdateTypeOptions) *TypeUpdater { @@ -238,7 +238,7 @@ func (u *TypeUpdater) generate() error { for _, msg := range u.dependentMessages { var buf bytes.Buffer - klog.Infof("genearte Go code for messge %s", msg.FullName()) + klog.Infof("generate Go code for messge %s", msg.FullName()) codegen.WriteMessage(&buf, msg) u.generatedGoStructs = append(u.generatedGoStructs, generatedGoStruct{ diff --git a/dev/tools/controllerbuilder/scaffold/apis.go b/dev/tools/controllerbuilder/scaffold/apis.go index 5db0d97dd4..a049c3460e 100644 --- a/dev/tools/controllerbuilder/scaffold/apis.go +++ b/dev/tools/controllerbuilder/scaffold/apis.go @@ -145,7 +145,7 @@ func (a *APIScaffolder) AddGroupVersionFile() error { Version: a.Version, PackageProtoTag: a.PackageProtoTag, } - return scaffoldGropuVersionFile(docFilePath, cArgs) + return scaffoldGroupVersionFile(docFilePath, cArgs) } func (a *APIScaffolder) DocFileNotExist() bool { @@ -183,7 +183,7 @@ func scaffoldDocFile(path string, cArgs *apis.APIArgs) error { return nil } -func scaffoldGropuVersionFile(path string, cArgs *apis.APIArgs) error { +func scaffoldGroupVersionFile(path string, cArgs *apis.APIArgs) error { tmpl, err := template.New("groupversioninfo.go").Parse(apis.GroupVersionInfoTemplate) if err != nil { return fmt.Errorf("parse groupversion_info.go template: %w", err) diff --git a/docs/releasenotes/release-1.119.md b/docs/releasenotes/release-1.119.md index da0b843dc3..e605baaa29 100644 --- a/docs/releasenotes/release-1.119.md +++ b/docs/releasenotes/release-1.119.md @@ -22,7 +22,7 @@ ## New Fields: * `ComputeForwardingRule` - * Added the `spec.target.serviceAttachmentRef` field, allowing a `ComputeForwaringRule` to target a `ComputeServiceAttachment`. + * Added the `spec.target.serviceAttachmentRef` field, allowing a `ComputeForwardingRule` to target a `ComputeServiceAttachment`. * `ContainerCluster` * Added previous output-only spec fields to `status.observedState` diff --git a/experiments/compositions/Design Notes/Controller Runtime and Dynamic Controllers.md b/experiments/compositions/Design Notes/Controller Runtime and Dynamic Controllers.md index f0bda0ef45..67b1f01dd4 100644 --- a/experiments/compositions/Design Notes/Controller Runtime and Dynamic Controllers.md +++ b/experiments/compositions/Design Notes/Controller Runtime and Dynamic Controllers.md @@ -41,7 +41,7 @@ controller-runtime's Manager interface provides no way to check if a controller `type Manager interface {}` : https://github.com/kubernetes-sigs/controller-runtime/blob/main/pkg/manager/manager.go#L55 `type Cluster interface {}` : https://github.com/kubernetes-sigs/controller-runtime/blob/main/pkg/cluster/cluster.go#L40 -We would need to build an intrerface on top of the manager that supports checking if a controller exists in a manager. +We would need to build an interface on top of the manager that supports checking if a controller exists in a manager. ## No support for stopping a controller diff --git a/experiments/compositions/Design Notes/Feedback.md b/experiments/compositions/Design Notes/Feedback.md index a2b70df078..20cf6c4c91 100644 --- a/experiments/compositions/Design Notes/Feedback.md +++ b/experiments/compositions/Design Notes/Feedback.md @@ -17,5 +17,5 @@ Validations for facade input fields at which level (crd, expander, gatekeeper) Default values for facade input fields (crd, expander, gatekeeper) Troubleshooting - make it easy to detect who needs to act Platform admin or AppTeamOperator - - who breaks glass and what is allowed (can appteam mutate generataed resources ? ) + - who breaks glass and what is allowed (can appteam mutate generated resources ? ) - who carries the pager (admin & appteam OR appteam OR admin) diff --git a/experiments/kubectl-plan/pkg/plan/planner.go b/experiments/kubectl-plan/pkg/plan/planner.go index 66fca692ad..d016bdb432 100644 --- a/experiments/kubectl-plan/pkg/plan/planner.go +++ b/experiments/kubectl-plan/pkg/plan/planner.go @@ -61,7 +61,7 @@ func (r *Planner) BuildPlan(ctx context.Context, objects []*unstructured.Unstruc resource, err := target.ResourceForGVK(ctx, gvk) if err != nil { // The Kind doesn't even exist; the object can't exist already - // TODO: We should invalide mappings above, in case our cache is out of date + // TODO: We should invalidate mappings above, in case our cache is out of date action.Type = ActionTypeCreate plan.Spec.Actions = append(plan.Spec.Actions, action) continue diff --git a/install-bundles/install-bundle-autopilot-gcp-identity/crds.yaml b/install-bundles/install-bundle-autopilot-gcp-identity/crds.yaml index 33ed979158..c9811fe825 100644 --- a/install-bundles/install-bundle-autopilot-gcp-identity/crds.yaml +++ b/install-bundles/install-bundle-autopilot-gcp-identity/crds.yaml @@ -109947,7 +109947,7 @@ spec: type: string type: object id: - description: Required. Id of the artifact, which the installation + description: Required. ID of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id. type: string diff --git a/install-bundles/install-bundle-autopilot-namespaced/crds.yaml b/install-bundles/install-bundle-autopilot-namespaced/crds.yaml index 33ed979158..c9811fe825 100644 --- a/install-bundles/install-bundle-autopilot-namespaced/crds.yaml +++ b/install-bundles/install-bundle-autopilot-namespaced/crds.yaml @@ -109947,7 +109947,7 @@ spec: type: string type: object id: - description: Required. Id of the artifact, which the installation + description: Required. ID of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id. type: string diff --git a/install-bundles/install-bundle-autopilot-workload-identity/crds.yaml b/install-bundles/install-bundle-autopilot-workload-identity/crds.yaml index 33ed979158..c9811fe825 100644 --- a/install-bundles/install-bundle-autopilot-workload-identity/crds.yaml +++ b/install-bundles/install-bundle-autopilot-workload-identity/crds.yaml @@ -109947,7 +109947,7 @@ spec: type: string type: object id: - description: Required. Id of the artifact, which the installation + description: Required. ID of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id. type: string diff --git a/install-bundles/install-bundle-gcp-identity/crds.yaml b/install-bundles/install-bundle-gcp-identity/crds.yaml index 33ed979158..c9811fe825 100644 --- a/install-bundles/install-bundle-gcp-identity/crds.yaml +++ b/install-bundles/install-bundle-gcp-identity/crds.yaml @@ -109947,7 +109947,7 @@ spec: type: string type: object id: - description: Required. Id of the artifact, which the installation + description: Required. ID of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id. type: string diff --git a/install-bundles/install-bundle-namespaced/crds.yaml b/install-bundles/install-bundle-namespaced/crds.yaml index 33ed979158..c9811fe825 100644 --- a/install-bundles/install-bundle-namespaced/crds.yaml +++ b/install-bundles/install-bundle-namespaced/crds.yaml @@ -109947,7 +109947,7 @@ spec: type: string type: object id: - description: Required. Id of the artifact, which the installation + description: Required. ID of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id. type: string diff --git a/install-bundles/install-bundle-workload-identity/crds.yaml b/install-bundles/install-bundle-workload-identity/crds.yaml index 33ed979158..c9811fe825 100644 --- a/install-bundles/install-bundle-workload-identity/crds.yaml +++ b/install-bundles/install-bundle-workload-identity/crds.yaml @@ -109947,7 +109947,7 @@ spec: type: string type: object id: - description: Required. Id of the artifact, which the installation + description: Required. ID of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id. type: string diff --git a/mockgcp/README.md b/mockgcp/README.md index 61343a2ef5..84ad4ba916 100644 --- a/mockgcp/README.md +++ b/mockgcp/README.md @@ -28,7 +28,7 @@ Broadly the steps are: 1. Add the proto to the Makefile and run `make gen-proto` (or just `make`). - All google services are located in [googleapis Github repo](https://github.com/googleapis/googleapis/tree/master/google), + All google services are located in [googleapis GitHub repo](https://github.com/googleapis/googleapis/tree/master/google), refer to your resource's API documentation to identify the service name, for example [privateca](https://cloud.google.com/certificate-authority-service/docs/reference/rest#service:-privateca.googleapis.com). Once you identify the service, find the proper path to the proto files, for example: `cloud/security/privateca/v1/*.proto`. Then replace the prefix `googleapis/google/` to `./third_party/googleapis/mockgcp/`, diff --git a/mockgcp/mockgkehub/gkehubfeature.go b/mockgcp/mockgkehub/gkehubfeature.go index 4664a1059b..1aa4d97c29 100644 --- a/mockgcp/mockgkehub/gkehubfeature.go +++ b/mockgcp/mockgkehub/gkehubfeature.go @@ -67,7 +67,7 @@ func (s *GKEHubFeature) CreateFeature(ctx context.Context, req *pb.CreateFeature acmSpec := spec.GetConfigmanagement() if acmSpec != nil { if acmSpec.GetConfigSync() == nil && acmSpec.GetHierarchyController() == nil && acmSpec.GetPolicyController() == nil { - return nil, fmt.Errorf("none of configsync or hierachycontroller or policycontroller is specified under configmanagement for memebership %s", id) + return nil, fmt.Errorf("none of configsync or hierarchycontroller or policycontroller is specified under configmanagement for memebership %s", id) } } } diff --git a/operator/autopilot-channels/packages/configconnector/1.123.1/crds.yaml b/operator/autopilot-channels/packages/configconnector/1.123.1/crds.yaml index fadc9a3100..dd4c783e42 100644 --- a/operator/autopilot-channels/packages/configconnector/1.123.1/crds.yaml +++ b/operator/autopilot-channels/packages/configconnector/1.123.1/crds.yaml @@ -107727,7 +107727,7 @@ spec: type: string type: object id: - description: Required. Id of the artifact, which the installation + description: Required. ID of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id. type: string diff --git a/operator/autopilot-channels/packages/configconnector/1.124.0/crds.yaml b/operator/autopilot-channels/packages/configconnector/1.124.0/crds.yaml index 170475e374..1497185ae9 100644 --- a/operator/autopilot-channels/packages/configconnector/1.124.0/crds.yaml +++ b/operator/autopilot-channels/packages/configconnector/1.124.0/crds.yaml @@ -108099,7 +108099,7 @@ spec: type: string type: object id: - description: Required. Id of the artifact, which the installation + description: Required. ID of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id. type: string diff --git a/operator/autopilot-channels/packages/configconnector/1.125.0/crds.yaml b/operator/autopilot-channels/packages/configconnector/1.125.0/crds.yaml index 33ed979158..c9811fe825 100644 --- a/operator/autopilot-channels/packages/configconnector/1.125.0/crds.yaml +++ b/operator/autopilot-channels/packages/configconnector/1.125.0/crds.yaml @@ -109947,7 +109947,7 @@ spec: type: string type: object id: - description: Required. Id of the artifact, which the installation + description: Required. ID of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id. type: string diff --git a/operator/channels/packages/configconnector/1.123.1/crds.yaml b/operator/channels/packages/configconnector/1.123.1/crds.yaml index fadc9a3100..dd4c783e42 100644 --- a/operator/channels/packages/configconnector/1.123.1/crds.yaml +++ b/operator/channels/packages/configconnector/1.123.1/crds.yaml @@ -107727,7 +107727,7 @@ spec: type: string type: object id: - description: Required. Id of the artifact, which the installation + description: Required. ID of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id. type: string diff --git a/operator/channels/packages/configconnector/1.124.0/crds.yaml b/operator/channels/packages/configconnector/1.124.0/crds.yaml index 170475e374..1497185ae9 100644 --- a/operator/channels/packages/configconnector/1.124.0/crds.yaml +++ b/operator/channels/packages/configconnector/1.124.0/crds.yaml @@ -108099,7 +108099,7 @@ spec: type: string type: object id: - description: Required. Id of the artifact, which the installation + description: Required. ID of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id. type: string diff --git a/operator/channels/packages/configconnector/1.125.0/crds.yaml b/operator/channels/packages/configconnector/1.125.0/crds.yaml index 33ed979158..c9811fe825 100644 --- a/operator/channels/packages/configconnector/1.125.0/crds.yaml +++ b/operator/channels/packages/configconnector/1.125.0/crds.yaml @@ -109947,7 +109947,7 @@ spec: type: string type: object id: - description: Required. Id of the artifact, which the installation + description: Required. ID of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id. type: string diff --git a/pkg/cli/outputsink/sink_test.go b/pkg/cli/outputsink/sink_test.go index f75e412c3f..f368bd88cd 100644 --- a/pkg/cli/outputsink/sink_test.go +++ b/pkg/cli/outputsink/sink_test.go @@ -50,7 +50,7 @@ func TestDirectorySink(t *testing.T) { testCases := []struct { name string sinkConstructor func(*schema.Provider, string) outputsink.OutputSink - // the file that will be read, with results passed in to the sink for testing + // the file that will be read, with results passed into the sink for testing testCaseFile string // the yaml file to use to pull unstructured schemas unstructuredFile string diff --git a/pkg/clients/generated/apis/osconfig/v1beta1/osconfigguestpolicy_types.go b/pkg/clients/generated/apis/osconfig/v1beta1/osconfigguestpolicy_types.go index 7145f1b32f..c645dbe401 100644 --- a/pkg/clients/generated/apis/osconfig/v1beta1/osconfigguestpolicy_types.go +++ b/pkg/clients/generated/apis/osconfig/v1beta1/osconfigguestpolicy_types.go @@ -78,7 +78,7 @@ type GuestpolicyArtifacts struct { // +optional Gcs *GuestpolicyGcs `json:"gcs,omitempty"` - /* Required. Id of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id. */ + /* Required. ID of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id. */ // +optional Id *string `json:"id,omitempty"` diff --git a/pkg/controller/direct/gkehub/acmconversion.go b/pkg/controller/direct/gkehub/acmconversion.go index 3d851b1823..2d07a3ae44 100644 --- a/pkg/controller/direct/gkehub/acmconversion.go +++ b/pkg/controller/direct/gkehub/acmconversion.go @@ -35,7 +35,7 @@ func convertKRMtoAPI_ConfigManagement(r *krm.FeaturemembershipConfigmanagement) apiObj.ConfigSync = val } if r.HierarchyController != nil { - apiObj.HierarchyController = convertKRMtoAPI_HierachyController(r.HierarchyController) + apiObj.HierarchyController = convertKRMtoAPI_HierarchyController(r.HierarchyController) } if r.PolicyController != nil { val, err := convertKRMtoAPI_ConfigManagementPolicyController(r.PolicyController) @@ -92,7 +92,7 @@ func convertKRMtoAPI_Monitoring(r *krm.FeaturemembershipMonitoring) *featureapi. return &apiObj } -func convertKRMtoAPI_HierachyController(r *krm.FeaturemembershipHierarchyController) *featureapi.ConfigManagementHierarchyControllerConfig { +func convertKRMtoAPI_HierarchyController(r *krm.FeaturemembershipHierarchyController) *featureapi.ConfigManagementHierarchyControllerConfig { apiObj := featureapi.ConfigManagementHierarchyControllerConfig{} if r.EnableHierarchicalResourceQuota != nil { apiObj.EnableHierarchicalResourceQuota = *r.EnableHierarchicalResourceQuota diff --git a/pkg/dcl/fields.go b/pkg/dcl/fields.go index e9a6fce242..332f1fb852 100644 --- a/pkg/dcl/fields.go +++ b/pkg/dcl/fields.go @@ -54,7 +54,7 @@ func TrimNilFields(m map[string]interface{}) { } } -// An interface value strictly equals to nil only if the V (actual value) and T (type) are both unset; +// An interface value is strictly equal to nil only if the V (actual value) and T (type) are both unset; // we want to treat interface values like (T=[]interface{}, V=nil) as nil too since the actual value is nil. func IsNil(v interface{}) bool { if v == nil { diff --git a/pkg/k8s/managedfields.go b/pkg/k8s/managedfields.go index 28c2875404..ad03a7da66 100644 --- a/pkg/k8s/managedfields.go +++ b/pkg/k8s/managedfields.go @@ -178,7 +178,7 @@ func OverlayManagedFieldsOntoState(spec, stateAsKRM map[string]interface{}, mana // resource supports hierarchical references. We do this because // overlayManagedFieldsOntoState() strips out the hierarchical reference if // it was defaulted by the KCC webhook/controller. This is because the - // resource's managedFields metadata doesn't include the hierarchcial + // resource's managedFields metadata doesn't include the hierarchical // reference if it was defaulted by KCC rather than explicitly set by the // user. Since we know that a resource's hierarchical reference is part of // the desired state even if it's not in the managedFields metadata, let's diff --git a/pkg/test/controller/reconciler/testreconciler.go b/pkg/test/controller/reconciler/testreconciler.go index 72b34c6a39..3235400198 100644 --- a/pkg/test/controller/reconciler/testreconciler.go +++ b/pkg/test/controller/reconciler/testreconciler.go @@ -115,7 +115,7 @@ func NewTestReconciler(t *testing.T, mgr manager.Manager, provider *tfschema.Pro if err := registry.Init(context.TODO(), &config.ControllerConfig{ HTTPClient: httpClient, }); err != nil { - t.Fatalf("error intializing direct registry: %v", err) + t.Fatalf("error initializing direct registry: %v", err) } return &TestReconciler{ diff --git a/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableappprofile/create.yaml b/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableappprofile/create.yaml index 077a0776b1..4875af3184 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableappprofile/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableappprofile/create.yaml @@ -19,7 +19,7 @@ metadata: annotations: cnrm.cloud.google.com/ignore-warnings: "true" spec: - description: Automagically routs requests to the neatest viable nest in an insistance. + description: Automagically routs requests to the neatest viable nest in an instance. instanceRef: name: profiledep${uniqueId} singleClusterRouting: diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/osconfig/osconfigguestpolicy.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/osconfig/osconfigguestpolicy.md index 6db9daa342..0918528d0b 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/osconfig/osconfigguestpolicy.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/osconfig/osconfigguestpolicy.md @@ -821,7 +821,7 @@ Allowed value: The Google Cloud resource name of a `StorageBucket` resource (for

string

-

{% verbatim %}Required. Id of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id.{% endverbatim %}

+

{% verbatim %}Required. ID of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id.{% endverbatim %}

diff --git a/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/osconfig/resource_os_config_guest_policies.go b/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/osconfig/resource_os_config_guest_policies.go index 8a493ec4b2..fe842bcd95 100644 --- a/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/osconfig/resource_os_config_guest_policies.go +++ b/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/osconfig/resource_os_config_guest_policies.go @@ -359,7 +359,7 @@ could potentially have conflicting assignments.`, "id": { Type: schema.TypeString, Required: true, - Description: `Id of the artifact, which the installation and update steps of this recipe can reference. + Description: `ID of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id.`, }, "allow_insecure": { diff --git a/third_party/github.com/hashicorp/terraform-provider-google-beta/website/docs/r/os_config_guest_policies.html.markdown b/third_party/github.com/hashicorp/terraform-provider-google-beta/website/docs/r/os_config_guest_policies.html.markdown index 06440df4e8..a889d71afa 100644 --- a/third_party/github.com/hashicorp/terraform-provider-google-beta/website/docs/r/os_config_guest_policies.html.markdown +++ b/third_party/github.com/hashicorp/terraform-provider-google-beta/website/docs/r/os_config_guest_policies.html.markdown @@ -464,7 +464,7 @@ The following arguments are supported: * `id` - (Required) - Id of the artifact, which the installation and update steps of this recipe can reference. + ID of the artifact, which the installation and update steps of this recipe can reference. Artifacts in a recipe cannot have the same id. * `allow_insecure` -