From 9ddb542d09f94875dd07d3026eb348be61a36a5d Mon Sep 17 00:00:00 2001
From: Jayanth Varavani <1111446+jayanthvn@users.noreply.github.com>
Date: Fri, 23 Jul 2021 13:26:31 -0700
Subject: [PATCH] Update CNI charts image version (#1543) (#1546)

* Update CNI charts image version

* updated the labels

* CRD update

* update charts version

* minor nits

* fix charts ver

* fix charts ver
---
 charts/aws-calico/Chart.yaml                               | 4 ++--
 charts/aws-vpc-cni/Chart.yaml                              | 4 ++--
 charts/aws-vpc-cni/templates/customresourcedefinition.yaml | 6 +++++-
 charts/cni-metrics-helper/Chart.yaml                       | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/charts/aws-calico/Chart.yaml b/charts/aws-calico/Chart.yaml
index 86ba682c33..0d3ada51dd 100644
--- a/charts/aws-calico/Chart.yaml
+++ b/charts/aws-calico/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v1
 description: A Helm chart for installing Calico on AWS
 website: https://docs.aws.amazon.com/eks/latest/userguide/calico.html
 name: aws-calico
-version: 0.3.4
-appVersion: 3.15.1
+version: 0.3.7
+appVersion: 3.19.1
 icon: https://www.projectcalico.org/wp-content/uploads/2019/09/Calico_Logo_Large_Calico.png
diff --git a/charts/aws-vpc-cni/Chart.yaml b/charts/aws-vpc-cni/Chart.yaml
index 1fa7fa63df..8fec585224 100644
--- a/charts/aws-vpc-cni/Chart.yaml
+++ b/charts/aws-vpc-cni/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: aws-vpc-cni
-version: 1.1.7
-appVersion: "v1.8.0"
+version: 1.1.8
+appVersion: "v1.9.0"
 description: A Helm chart for the AWS VPC CNI
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 home: https://github.com/aws/amazon-vpc-cni-k8s
diff --git a/charts/aws-vpc-cni/templates/customresourcedefinition.yaml b/charts/aws-vpc-cni/templates/customresourcedefinition.yaml
index bdd29e7a8b..2385fb3a7c 100644
--- a/charts/aws-vpc-cni/templates/customresourcedefinition.yaml
+++ b/charts/aws-vpc-cni/templates/customresourcedefinition.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.crd.create -}}
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: eniconfigs.crd.k8s.amazonaws.com
@@ -12,6 +12,10 @@ spec:
     - name: v1alpha1
       served: true
       storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
+          x-kubernetes-preserve-unknown-fields: true
   names:
     plural: eniconfigs
     singular: eniconfig
diff --git a/charts/cni-metrics-helper/Chart.yaml b/charts/cni-metrics-helper/Chart.yaml
index 72653ee6af..59b4fdb092 100644
--- a/charts/cni-metrics-helper/Chart.yaml
+++ b/charts/cni-metrics-helper/Chart.yaml
@@ -15,9 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: v1.8.0
+appVersion: v1.9.0