From a800170035ee0d1fd2f1e353aaa0ffd9fb54f553 Mon Sep 17 00:00:00 2001
From: Erin Corson <frodopwns@gmail.com>
Date: Thu, 3 Oct 2019 14:27:13 -0600
Subject: [PATCH] pulling updated ignore file from master to address merge
 conflicts

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index 53a14efc09c..bbc5104e739 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,11 @@ coverage.xml
 testlogs.txt
 .DS_Store
 
+# Generated CRDS
+config/crd/bases/*
+config/rbac/role.yaml
+api/v1/zz_generated.*
+
 # Kubernetes Generated files - skip generated files, except for vendored files
 
 !vendor/**/zz_generated.*