Merge pull request #72 from hashicorp/api-gateway/v0.4.0

api-gateway: update for v0.4.0 release
hashicorp · Aug 22, 2022 · 85de186 · 85de186
2 parents b7d6155 + e932205
commit 85de186
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/api-gateway/cloud/api-gw/consul-api-gateway.yaml b/api-gateway/cloud/api-gw/consul-api-gateway.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: gateway.networking.k8s.io/v1alpha2
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: Gateway
 metadata:
   name: api-gateway
@@ -11,4 +11,4 @@ spec:
     name: http
     allowedRoutes:
       namespaces:
-        from: Same
+        from: Same
diff --git a/api-gateway/cloud/api-gw/routes.yaml b/api-gateway/cloud/api-gw/routes.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: gateway.networking.k8s.io/v1alpha2
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: example-route-1
@@ -21,7 +21,7 @@ spec:
       port: 8090
       weight: 50
 ---
-apiVersion: gateway.networking.k8s.io/v1alpha2
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: example-route-2
@@ -36,4 +36,4 @@ spec:
     backendRefs:
     - kind: Service
       name: nginx
-      port: 80
+      port: 80
diff --git a/api-gateway/cloud/terraform/modules/eks-client/variables.tf b/api-gateway/cloud/terraform/modules/eks-client/variables.tf
@@ -41,11 +41,11 @@ variable "consul_version" {
 variable "chart_version" {
   type        = string
   description = "The Consul Helm chart version to use"
-  default     = "0.45.0"
+  default     = "0.47.1"
 }
 
 variable "api_gateway_version" {
   type        = string
   description = "The Consul API gateway image version to use"
-  default     = "0.3.0"
+  default     = "0.4.0"
 }
diff --git a/api-gateway/cloud/terraform/variables.tf b/api-gateway/cloud/terraform/variables.tf
@@ -37,11 +37,11 @@ variable "consul_tier" {
 variable "consul_version" {
   type        = string
   description = "The HCP Consul version"
-  default     = "v1.12.0"
+  default     = "v1.13.1"
 }
 
 variable "api_gateway_version" {
   type        = string
   description = "The Consul API gateway CRD version to use"
-  default     = "0.3.0"
+  default     = "0.4.0"
 }
diff --git a/api-gateway/local/README.md b/api-gateway/local/README.md
@@ -3,14 +3,14 @@
 1. Clone repo
 2. `cd api-gateway/local/`
 3. `kind create cluster --config=kind/cluster.yaml`
-4. `kubectl apply -k "github.com/hashicorp/consul-api-gateway/config/crd?ref=v0.3.0"`
+4. `kubectl apply -k "github.com/hashicorp/consul-api-gateway/config/crd?ref=v0.4.0"`
 5. `helm repo add hashicorp https://helm.releases.hashicorp.com`
 6. `helm repo update`
 7. Install Consul
     1. Helm: 
-    `helm install --values consul/config.yaml consul hashicorp/consul --create-namespace --namespace consul --version "0.45.0"`
+    `helm install --values consul/config.yaml consul hashicorp/consul --create-namespace --namespace consul --version "0.47.1"`
     2. Consul K8S:
-    `consul-k8s install -config-file=consul/config.yaml -set global.image=hashicorp/consul:1.12.2`
+    `consul-k8s install -config-file=consul/config.yaml -set global.image=hashicorp/consul:1.13.1`
 8. `kubectl apply --filename two-services`
 9.  `kubectl apply --filename api-gw/consul-api-gateway.yaml --namespace consul && kubectl wait --for=condition=ready gateway/api-gateway --namespace consul --timeout=90s && kubectl apply --filename api-gw/routes.yaml --namespace consul` 
 10.  `kubectl port-forward svc/consul-ui --namespace consul 6443:443`

diff --git a/api-gateway/local/api-gw/consul-api-gateway.yaml b/api-gateway/local/api-gw/consul-api-gateway.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: gateway.networking.k8s.io/v1alpha2
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: Gateway
 metadata:
   name: api-gateway

diff --git a/api-gateway/local/api-gw/routes.yaml b/api-gateway/local/api-gw/routes.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: gateway.networking.k8s.io/v1alpha2
+apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   name: example-route-1

diff --git a/api-gateway/local/consul/config.yaml b/api-gateway/local/consul/config.yaml
@@ -15,7 +15,7 @@ controller:
   enabled: true
 apiGateway:
   enabled: true
-  image: "hashicorp/consul-api-gateway:0.3.0"
+  image: "hashicorp/consul-api-gateway:0.4.0"
   managedGatewayClass:
     serviceType: NodePort
     useHostPorts: true
diff --git a/...y/local/two-services/referencepolicy.yaml → ...ay/local/two-services/referencegrant.yaml b/...y/local/two-services/referencepolicy.yaml → ...ay/local/two-services/referencegrant.yaml
@@ -1,7 +1,7 @@
 apiVersion: gateway.networking.k8s.io/v1alpha2
-kind: ReferencePolicy
+kind: ReferenceGrant
 metadata:
-  name: example-reference-policy
+  name: example-reference-grant
   namespace: default
 spec:
   from: