From 622534789af608133b3adc5585862427735edaad Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@datawire.io>
Date: Fri, 4 Feb 2022 12:33:30 -0700
Subject: [PATCH 1/2] Simplify the venv rule

Signed-off-by: Luke Shumaker <lukeshu@datawire.io>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e7acbf4..2e6423f 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ generate/files += $(EDGE_STACK_HOME)/.circleci/config.yml
 
 $(EDGE_STACK_HOME)/venv:
 	python3 -m venv $@
-	$@/bin/python -m pip install ruamel.yaml
+	$@/bin/pip3 install ruamel.yaml
 
 FORCE:
 .PHONY: FORCE

From d79c6500830afd9cb58adeebe997dc831f7589a3 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@datawire.io>
Date: Fri, 4 Feb 2022 12:44:10 -0700
Subject: [PATCH 2/2] make generate from apro.git

Signed-off-by: Luke Shumaker <lukeshu@datawire.io>
---
 manifests/edge-stack/aes-crds.yaml | 34 +++++++++++++++---------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/manifests/edge-stack/aes-crds.yaml b/manifests/edge-stack/aes-crds.yaml
index 0b3bbfe..d152843 100644
--- a/manifests/edge-stack/aes-crds.yaml
+++ b/manifests/edge-stack/aes-crds.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.2
   labels:
     app.kubernetes.io/instance: emissary-apiext
     app.kubernetes.io/managed-by: kubectl_apply_-f_aes-apiext.yaml
@@ -234,7 +234,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.2
   labels:
     app.kubernetes.io/instance: emissary-apiext
     app.kubernetes.io/managed-by: kubectl_apply_-f_aes-apiext.yaml
@@ -1181,7 +1181,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.2
   labels:
     app.kubernetes.io/instance: emissary-apiext
     app.kubernetes.io/managed-by: kubectl_apply_-f_aes-apiext.yaml
@@ -1562,7 +1562,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.2
   labels:
     app.kubernetes.io/instance: emissary-apiext
     app.kubernetes.io/managed-by: kubectl_apply_-f_aes-apiext.yaml
@@ -1851,7 +1851,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.2
   labels:
     app.kubernetes.io/instance: emissary-apiext
     app.kubernetes.io/managed-by: kubectl_apply_-f_aes-apiext.yaml
@@ -1954,7 +1954,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.2
   labels:
     app.kubernetes.io/instance: emissary-apiext
     app.kubernetes.io/managed-by: kubectl_apply_-f_aes-apiext.yaml
@@ -2221,7 +2221,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.2
   labels:
     app.kubernetes.io/instance: emissary-apiext
     app.kubernetes.io/managed-by: kubectl_apply_-f_aes-apiext.yaml
@@ -2861,7 +2861,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.2
   labels:
     app.kubernetes.io/instance: emissary-apiext
     app.kubernetes.io/managed-by: kubectl_apply_-f_aes-apiext.yaml
@@ -2957,7 +2957,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.2
   labels:
     app.kubernetes.io/instance: emissary-apiext
     app.kubernetes.io/managed-by: kubectl_apply_-f_aes-apiext.yaml
@@ -3053,7 +3053,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.2
   labels:
     app.kubernetes.io/instance: emissary-apiext
     app.kubernetes.io/managed-by: kubectl_apply_-f_aes-apiext.yaml
@@ -3250,7 +3250,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.2
   labels:
     app.kubernetes.io/instance: emissary-apiext
     app.kubernetes.io/managed-by: kubectl_apply_-f_aes-apiext.yaml
@@ -3403,7 +3403,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.2
   labels:
     app.kubernetes.io/instance: emissary-apiext
     app.kubernetes.io/managed-by: kubectl_apply_-f_aes-apiext.yaml
@@ -4411,7 +4411,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.2
   labels:
     app.kubernetes.io/instance: emissary-apiext
     app.kubernetes.io/managed-by: kubectl_apply_-f_aes-apiext.yaml
@@ -4518,7 +4518,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.2
   labels:
     app.kubernetes.io/instance: emissary-apiext
     app.kubernetes.io/managed-by: kubectl_apply_-f_aes-apiext.yaml
@@ -4683,7 +4683,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.2
   labels:
     app.kubernetes.io/instance: emissary-apiext
     app.kubernetes.io/managed-by: kubectl_apply_-f_aes-apiext.yaml
@@ -4910,7 +4910,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.2
   labels:
     app.kubernetes.io/instance: emissary-apiext
     app.kubernetes.io/managed-by: kubectl_apply_-f_aes-apiext.yaml
@@ -5093,7 +5093,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.2
   labels:
     app.kubernetes.io/instance: emissary-apiext
     app.kubernetes.io/managed-by: kubectl_apply_-f_aes-apiext.yaml
