Merge branch 'aws:main' into main

mikhail-aws · web-flow · commit 09ce20d6ec53 · 2023-11-17T16:11:50.000-08:00
diff --git a/config/crds/bases/application-networking.k8s.aws_targetgrouppolicies.yaml b/config/crds/bases/application-networking.k8s.aws_targetgrouppolicies.yaml
@@ -178,12 +178,12 @@ spec:
                   reason: Pending
                   status: Unknown
                   type: Programmed
-                description: "Conditions describe the current conditions of the AccessLogPolicy.
+                description: "Conditions describe the current conditions of the TargetGroup.
                   \n Implementations should prefer to express Policy conditions using
                   the `PolicyConditionType` and `PolicyConditionReason` constants
                   so that operators and tools can converge on a common vocabulary
-                  to describe AccessLogPolicy state. \n Known condition types are:
-                  \n * \"Accepted\" * \"Ready\""
+                  to describe TargetGroup state. \n Known condition types are: \n
+                  * \"Accepted\" * \"Ready\""
                 items:
                   description: "Condition contains details for one aspect of the current
                     state of this API Resource. --- This struct is intended for direct
diff --git a/docs/api-reference.md b/docs/api-reference.md
@@ -1524,7 +1524,7 @@ HealthCheckConfig
 (<em>Appears on:</em><a href="#application-networking.k8s.aws/v1alpha1.TargetGroupPolicy">TargetGroupPolicy</a>)
 </p>
 <div>
-<p>TargetGroupPolicyStatus defines the observed state of AccessLogPolicy.</p>
+<p>TargetGroupPolicyStatus defines the observed state of TargetGroupPolicy.</p>
 </div>
 <table>
 <thead>
diff --git a/docs/guides/deploy.md b/docs/guides/deploy.md
@@ -131,14 +131,11 @@ Alternatively, you can manually provide configuration variables when installing
 
 ## Controller Installation
 
-1. Run either `kubectl` or `helm` to deploy the controller. Check [Environment Variables](../concepts/environment.md) for detailed explanation of each configuration option.
-
+1. Run either `kubectl` or `helm` to deploy the controller. Check [Environment Variables](../guides/environment.md) for detailed explanation of each configuration option.
    ```bash
    kubectl apply -f examples/deploy-v0.0.18.yaml
    ```
-
    or
-
    ```bash
    # login to ECR
    aws ecr-public get-login-password --region us-east-1 | helm registry login --username AWS --password-stdin public.ecr.aws
diff --git a/docs/guides/environment.md b/docs/guides/environment.md
diff --git a/docs/guides/getstarted.md b/docs/guides/getstarted.md
@@ -6,7 +6,7 @@ The first part of this section provides an example of setting up of service-to-s
 The second section extends that example by creating another inventory service on a second cluster on a different VPC, and spreading traffic to that service across the two clusters and VPCs.
 Both clusters are created using `eksctl`, with both clusters created from the same account by the same cluster admin.
 
-Using these examples as a foundation, see the [Configuration](../concepts/index.md) section for ways to further configure service-to-service communications.
+Using these examples as a foundation, see the [Concepts](../concepts/overview.md) section for ways to further configure service-to-service communications.
 
 **NOTE**: You can get the yaml files used on this page by cloning the [AWS Gateway API Controller](https://github.com/aws/aws-application-networking-k8s) repository.
 
diff --git a/examples/deploy-v0.0.18.yaml b/examples/deploy-v0.0.18.yaml
@@ -7022,7 +7022,7 @@ spec:
             - targetRef
             type: object
           status:
-            description: TargetGroupPolicyStatus defines the observed state of AccessLogPolicy.
+            description: TargetGroupPolicyStatus defines the observed state of TargetGroupPolicy.
             properties:
               conditions:
                 default:
@@ -7036,11 +7036,11 @@ spec:
                   reason: Pending
                   status: Unknown
                   type: Programmed
-                description: "Conditions describe the current conditions of the AccessLogPolicy.
+                description: "Conditions describe the current conditions of the TargetGroupPolicy.
                   \n Implementations should prefer to express Policy conditions using
                   the `PolicyConditionType` and `PolicyConditionReason` constants
                   so that operators and tools can converge on a common vocabulary
-                  to describe AccessLogPolicy state. \n Known condition types are:
+                  to describe TargetGroupPolicy state. \n Known condition types are:
                   \n * \"Accepted\" * \"Ready\""
                 items:
                   description: "Condition contains details for one aspect of the current
diff --git a/helm/crds/application-networking.k8s.aws_targetgrouppolicies.yaml b/helm/crds/application-networking.k8s.aws_targetgrouppolicies.yaml
@@ -178,12 +178,12 @@ spec:
                   reason: Pending
                   status: Unknown
                   type: Programmed
-                description: "Conditions describe the current conditions of the AccessLogPolicy.
+                description: "Conditions describe the current conditions of the TargetGroup.
                   \n Implementations should prefer to express Policy conditions using
                   the `PolicyConditionType` and `PolicyConditionReason` constants
                   so that operators and tools can converge on a common vocabulary
-                  to describe AccessLogPolicy state. \n Known condition types are:
-                  \n * \"Accepted\" * \"Ready\""
+                  to describe TargetGroup state. \n Known condition types are: \n
+                  * \"Accepted\" * \"Ready\""
                 items:
                   description: "Condition contains details for one aspect of the current
                     state of this API Resource. --- This struct is intended for direct
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -10,9 +10,9 @@ nav:
   - User Guides:
     - Quick Start: guides/deploy.md
     - Basic Setup: guides/getstarted.md
+    - Configuration: guides/environment.md
   - Concepts:
     - Design Overview: concepts/overview.md
-    - Environment Variables: concepts/environment.md
     - TLS: concepts/https.md
     - Custom Domain Name: concepts/custom-domain-name.md
     - GRPC: concepts/grpc.md
diff --git a/pkg/apis/applicationnetworking/v1alpha1/targetgrouppolicy_types.go b/pkg/apis/applicationnetworking/v1alpha1/targetgrouppolicy_types.go
@@ -122,14 +122,14 @@ type HealthCheckConfig struct {
 	ProtocolVersion *HealthCheckProtocolVersion `json:"protocolVersion,omitempty"`
 }
 
-// TargetGroupPolicyStatus defines the observed state of AccessLogPolicy.
+// TargetGroupPolicyStatus defines the observed state of TargetGroup.
 type TargetGroupPolicyStatus struct {
-	// Conditions describe the current conditions of the AccessLogPolicy.
+	// Conditions describe the current conditions of the TargetGroup.
 	//
 	// Implementations should prefer to express Policy conditions
 	// using the `PolicyConditionType` and `PolicyConditionReason`
 	// constants so that operators and tools can converge on a common
-	// vocabulary to describe AccessLogPolicy state.
+	// vocabulary to describe TargetGroup state.
 	//
 	// Known condition types are:
 	//
