Skip to content

Commit

Permalink
change antreaConfig APIversion back to v1alpha1 (vmware-tanzu#4579)
Browse files Browse the repository at this point in the history 
The behavior in v1alpha2 is an additive change, not the kind that would necessitate a new API version, the only difference now is that the controller needs to look at the context it’s deploying into: if the Antrea version is sufficient and it’s being deployed in an NSX context, then it can automatically create an NSXServiceAccount.

Alternatively, if it needs to be optional even in that context, then it’s just an additional optional field being added to v1alpha1 with validations that ensure it’s only honored in the appropriate context.

Even with a v1alpha2, we don’t want to have branching behaviors based on a storage version. With a conversion webhook, the storage version will eventually be changed to v1alpha2 the next time the resource is written, meaning the controller and API version need a way to preserve compatibility with older v1alpha1-originating configurations. So either — or both — of these options need to be undertaken even if we were to produce a v1alpha2.

It might be a better option to revert the API change and preserve/augment the controller changes. Otherwise we’re adding extra conversion webhook overhead without benefit.

Signed-off-by: Bin Liu <[email protected]>
  • Loading branch information
@liu4480
liu4480 authored Apr 19, 2023
1 parent 9331f55 commit 7081502
Show file tree
Hide file tree
Showing 31 changed files with 256 additions and 1,574 deletions.
22 changes: 11 additions & 11 deletions addons/controllers/antrea/antreaconfig_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
"github.com/vmware-tanzu/tanzu-framework/addons/pkg/constants"
"github.com/vmware-tanzu/tanzu-framework/addons/pkg/util"
"github.com/vmware-tanzu/tanzu-framework/addons/predicates"
cniv1alpha2 "github.com/vmware-tanzu/tanzu-framework/apis/addonconfigs/cni/v1alpha2"
cniv1alpha1 "github.com/vmware-tanzu/tanzu-framework/apis/addonconfigs/cni/v1alpha1"
)

const (
Expand Down Expand Up @@ -84,7 +84,7 @@ func (r *AntreaConfigReconciler) Reconcile(ctx context.Context, req ctrl.Request
r.Log.Info("Start reconciliation")

// fetch AntreaConfig resource, ignore not-found errors
antreaConfig := &cniv1alpha2.AntreaConfig{}
antreaConfig := &cniv1alpha1.AntreaConfig{}
if err := r.Client.Get(ctx, req.NamespacedName, antreaConfig); err != nil {
if apierrors.IsNotFound(err) {
r.Log.Info(fmt.Sprintf("AntreaConfig resource '%v' not found", req.NamespacedName))
Expand Down Expand Up @@ -131,7 +131,7 @@ func (r *AntreaConfigReconciler) Reconcile(ctx context.Context, req ctrl.Request
// SetupWithManager sets up the controller with the Manager.
func (r *AntreaConfigReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
return ctrl.NewControllerManagedBy(mgr).
For(&cniv1alpha2.AntreaConfig{}).
For(&cniv1alpha1.AntreaConfig{}).
WithOptions(options).
Watches(
&source.Kind{Type: &clusterapiv1beta1.Cluster{}},
Expand All @@ -144,7 +144,7 @@ func (r *AntreaConfigReconciler) SetupWithManager(ctx context.Context, mgr ctrl.
// ReconcileAntreaConfig reconciles AntreaConfig CR
func (r *AntreaConfigReconciler) ReconcileAntreaConfig(
ctx context.Context,
antreaConfig *cniv1alpha2.AntreaConfig,
antreaConfig *cniv1alpha1.AntreaConfig,
cluster *clusterapiv1beta1.Cluster,
log logr.Logger) (_ ctrl.Result, retErr error) {

Expand Down Expand Up @@ -180,7 +180,7 @@ func (r *AntreaConfigReconciler) ReconcileAntreaConfig(
// ReconcileAntreaConfigNormal reconciles AntreaConfig by creating/patching data values secret
func (r *AntreaConfigReconciler) ReconcileAntreaConfigNormal(
ctx context.Context,
antreaConfig *cniv1alpha2.AntreaConfig,
antreaConfig *cniv1alpha1.AntreaConfig,
cluster *clusterapiv1beta1.Cluster,
log logr.Logger) (retErr error) {

Expand Down Expand Up @@ -216,7 +216,7 @@ func (r *AntreaConfigReconciler) ReconcileAntreaConfigNormal(
return r.registerAntreaNSX(ctx, antreaConfig, cluster)
}

func getClusterName(antreaConfig *cniv1alpha2.AntreaConfig) (name string, exists bool) {
func getClusterName(antreaConfig *cniv1alpha1.AntreaConfig) (name string, exists bool) {
name, exists = antreaConfig.Labels[clusterNameLabel]
if !exists {
index := strings.Index(antreaConfig.Name, "-antrea-package")
Expand All @@ -236,7 +236,7 @@ func (r *AntreaConfigReconciler) getNSXServiceAccountName(clusterName string) st
return fmt.Sprintf("%s-antrea", clusterName)
}

func (r *AntreaConfigReconciler) ensureNsxServiceAccount(ctx context.Context, antreaConfig *cniv1alpha2.AntreaConfig, cluster *clusterapiv1beta1.Cluster) error {
func (r *AntreaConfigReconciler) ensureNsxServiceAccount(ctx context.Context, antreaConfig *cniv1alpha1.AntreaConfig, cluster *clusterapiv1beta1.Cluster) error {
account := &nsxoperatorapi.NSXServiceAccount{}

account.Name = r.getNSXServiceAccountName(cluster.Name)
Expand Down Expand Up @@ -272,7 +272,7 @@ func (r *AntreaConfigReconciler) ensureNsxServiceAccount(ctx context.Context, an
return err
}

func (r *AntreaConfigReconciler) ensureProviderServiceAccount(ctx context.Context, antreaConfig *cniv1alpha2.AntreaConfig, cluster *clusterapiv1beta1.Cluster) error {
func (r *AntreaConfigReconciler) ensureProviderServiceAccount(ctx context.Context, antreaConfig *cniv1alpha1.AntreaConfig, cluster *clusterapiv1beta1.Cluster) error {
provider := &vsphere.ProviderServiceAccount{}
vsphereCluster, err := cutil.VSphereClusterParavirtualForCAPICluster(ctx, r.Client, cluster)
if err != nil {
Expand Down Expand Up @@ -328,7 +328,7 @@ func (r *AntreaConfigReconciler) ensureProviderServiceAccount(ctx context.Contex
return err
}

func (r *AntreaConfigReconciler) registerAntreaNSX(ctx context.Context, antreaConfig *cniv1alpha2.AntreaConfig, cluster *clusterapiv1beta1.Cluster) error {
func (r *AntreaConfigReconciler) registerAntreaNSX(ctx context.Context, antreaConfig *cniv1alpha1.AntreaConfig, cluster *clusterapiv1beta1.Cluster) error {
if !antreaConfig.Spec.AntreaNsx.Enable || antreaConfig.Spec.AntreaNsx.BootstrapFrom.Inline != nil {
r.Log.Info("antreaNsx is not enabled or inline is set, there is no ProviderServiceAccount or NsxServiceAccount to be created")
r.deregisterAntreaNSX(ctx, antreaConfig, cluster)
Expand All @@ -353,7 +353,7 @@ func (r *AntreaConfigReconciler) registerAntreaNSX(ctx context.Context, antreaCo
return err
}

func (r *AntreaConfigReconciler) deregisterAntreaNSX(ctx context.Context, antreaConfig *cniv1alpha2.AntreaConfig, cluster *clusterapiv1beta1.Cluster) error {
func (r *AntreaConfigReconciler) deregisterAntreaNSX(ctx context.Context, antreaConfig *cniv1alpha1.AntreaConfig, cluster *clusterapiv1beta1.Cluster) error {
if !antreaConfig.Spec.AntreaNsx.Enable {
r.Log.Info("antreaNsx is not enabled, there is no ProviderServiceAccount or NsxServiceAccount to be deleted")
return nil
Expand Down Expand Up @@ -393,7 +393,7 @@ func (r *AntreaConfigReconciler) deregisterAntreaNSX(ctx context.Context, antrea
// ReconcileAntreaConfigDataValue reconciles AntreaConfig data values secret
func (r *AntreaConfigReconciler) ReconcileAntreaConfigDataValue(
ctx context.Context,
antreaConfig *cniv1alpha2.AntreaConfig,
antreaConfig *cniv1alpha1.AntreaConfig,
cluster *clusterapiv1beta1.Cluster,
log logr.Logger) (retErr error) {

Expand Down
8 changes: 4 additions & 4 deletions addons/controllers/antrea/antreaconfig_util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/vmware-tanzu/tanzu-framework/addons/pkg/constants"
addontypes "github.com/vmware-tanzu/tanzu-framework/addons/pkg/types"
"github.com/vmware-tanzu/tanzu-framework/addons/pkg/util"
cniv1alpha2 "github.com/vmware-tanzu/tanzu-framework/apis/addonconfigs/cni/v1alpha2"
cniv1alpha1 "github.com/vmware-tanzu/tanzu-framework/apis/addonconfigs/cni/v1alpha1"
)

// AntreaConfigSpec defines the desired state of AntreaConfig
Expand Down Expand Up @@ -169,7 +169,7 @@ func (r *AntreaConfigReconciler) ClusterToAntreaConfig(o client.Object) []ctrl.R

r.Log.V(4).Info("Mapping cluster to AntreaConfig")

configs := &cniv1alpha2.AntreaConfigList{}
configs := &cniv1alpha1.AntreaConfigList{}

if err := r.Client.List(context.Background(), configs); err != nil {
r.Log.Error(err, "Error listing AntreaConfig")
Expand Down Expand Up @@ -209,11 +209,11 @@ func (r *AntreaConfigReconciler) ClusterToAntreaConfig(o client.Object) []ctrl.R
}

// MapAntreaConfigSpec is a handy function to use outside the pkg.
func MapAntreaConfigSpec(cluster *clusterv1beta1.Cluster, config *cniv1alpha2.AntreaConfig) (*AntreaConfigSpec, error) {
func MapAntreaConfigSpec(cluster *clusterv1beta1.Cluster, config *cniv1alpha1.AntreaConfig) (*AntreaConfigSpec, error) {
return mapAntreaConfigSpec(cluster, config, nil)
}

func mapAntreaConfigSpec(cluster *clusterv1beta1.Cluster, config *cniv1alpha2.AntreaConfig, client client.Client) (*AntreaConfigSpec, error) {
func mapAntreaConfigSpec(cluster *clusterv1beta1.Cluster, config *cniv1alpha1.AntreaConfig, client client.Client) (*AntreaConfigSpec, error) {

packageName := config.GetLabels()[addontypes.PackageNameLabel]
version := strings.TrimPrefix(strings.Split(packageName, "---")[0], "antrea.tanzu.vmware.com.")
Expand Down
32 changes: 16 additions & 16 deletions addons/controllers/antreaconfig_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/vmware-tanzu/tanzu-framework/addons/pkg/constants"
"github.com/vmware-tanzu/tanzu-framework/addons/pkg/util"
"github.com/vmware-tanzu/tanzu-framework/addons/test/testutil"
cniv1alpha2 "github.com/vmware-tanzu/tanzu-framework/apis/addonconfigs/cni/v1alpha2"
cniv1alpha1 "github.com/vmware-tanzu/tanzu-framework/apis/addonconfigs/cni/v1alpha1"
runtanzuv1alpha3 "github.com/vmware-tanzu/tanzu-framework/apis/run/v1alpha3"
)

Expand Down Expand Up @@ -116,7 +116,7 @@ var _ = Describe("AntreaConfig Reconciler and Webhooks", func() {
return err == nil
}, waitTimeout, pollingInterval).Should(BeTrue())

config := &cniv1alpha2.AntreaConfig{}
config := &cniv1alpha1.AntreaConfig{}
Eventually(func() bool {
err := k8sClient.Get(ctx, configKey, config)
if err != nil {
Expand Down Expand Up @@ -212,7 +212,7 @@ var _ = Describe("AntreaConfig Reconciler and Webhooks", func() {

Eventually(func() bool {
// Check status.secretRef after reconciliation
config := &cniv1alpha2.AntreaConfig{}
config := &cniv1alpha1.AntreaConfig{}
err := k8sClient.Get(ctx, configKey, config)
if err != nil {
return false
Expand Down Expand Up @@ -250,7 +250,7 @@ var _ = Describe("AntreaConfig Reconciler and Webhooks", func() {
return err == nil
}, waitTimeout, pollingInterval).Should(BeTrue())

config := &cniv1alpha2.AntreaConfig{}
config := &cniv1alpha1.AntreaConfig{}
Eventually(func() bool {
err := k8sClient.Get(ctx, configKey, config)
if err != nil {
Expand Down Expand Up @@ -334,7 +334,7 @@ var _ = Describe("AntreaConfig Reconciler and Webhooks", func() {

Eventually(func() bool {
// Check status.secretRef after reconciliation
config := &cniv1alpha2.AntreaConfig{}
config := &cniv1alpha1.AntreaConfig{}
err := k8sClient.Get(ctx, configKey, config)
if err != nil {
return false
Expand Down Expand Up @@ -380,7 +380,7 @@ var _ = Describe("AntreaConfig Reconciler and Webhooks", func() {
Namespace: addonNamespace,
Name: configCRName,
}
config := &cniv1alpha2.AntreaConfig{}
config := &cniv1alpha1.AntreaConfig{}
Expect(k8sClient.Get(ctx, key, config)).To(Succeed())

By("OwnerReferences is not set")
Expand All @@ -403,7 +403,7 @@ var _ = Describe("AntreaConfig Reconciler and Webhooks", func() {
Namespace: clusterNamespace,
Name: configCRName,
}
config := &cniv1alpha2.AntreaConfig{}
config := &cniv1alpha1.AntreaConfig{}
Expect(k8sClient.Get(ctx, key, config)).To(Succeed())

By("Trying to update the immutable TrafficEncapMode field in Antrea Spec")
Expand Down Expand Up @@ -443,7 +443,7 @@ var _ = Describe("AntreaConfig Reconciler and Webhooks", func() {
f.Close()

By("Create antrea config in the cluster's namespace with expected name pattern", func() {
datavalues := &cniv1alpha2.AntreaConfigDataValue{DefaultMTU: newDefaultMTU}
datavalues := &cniv1alpha1.AntreaConfigDataValue{DefaultMTU: newDefaultMTU}
antreaConfig := generateAntreaConfig(configName, clusterNamespace, datavalues)
err := k8sClient.Create(ctx, antreaConfig)
Expect(err).ToNot(HaveOccurred())
Expand Down Expand Up @@ -474,7 +474,7 @@ var _ = Describe("AntreaConfig Reconciler and Webhooks", func() {
})

By("Verify contents of resulting antrea config", func() {
antreaConfig := &cniv1alpha2.AntreaConfig{}
antreaConfig := &cniv1alpha1.AntreaConfig{}
key := client.ObjectKey{Name: clusterBootstrap.Spec.CNI.ValuesFrom.ProviderRef.Name, Namespace: clusterNamespace}
err := k8sClient.Get(ctx, key, antreaConfig)
Expect(err).ToNot(HaveOccurred())
Expand Down Expand Up @@ -518,7 +518,7 @@ var _ = Describe("AntreaConfig Reconciler and Webhooks", func() {
})

By("Create antrea config in the cluster's namespace with random name", func() {
datavalues := &cniv1alpha2.AntreaConfigDataValue{DefaultMTU: newDefaultMTU}
datavalues := &cniv1alpha1.AntreaConfigDataValue{DefaultMTU: newDefaultMTU}
antreaConfig := generateAntreaConfig(configName, clusterNamespace, datavalues)
err := k8sClient.Create(ctx, antreaConfig)
Expect(err).ToNot(HaveOccurred())
Expand All @@ -545,7 +545,7 @@ var _ = Describe("AntreaConfig Reconciler and Webhooks", func() {

By("Verify contents of resulting antrea config", func() {
// eventually the secret ref to the data values should be updated
antreaConfig := &cniv1alpha2.AntreaConfig{}
antreaConfig := &cniv1alpha1.AntreaConfig{}
Eventually(func() error {
configKey := client.ObjectKey{
Namespace: clusterNamespace,
Expand All @@ -561,7 +561,7 @@ var _ = Describe("AntreaConfig Reconciler and Webhooks", func() {
return nil
}, waitTimeout, pollingInterval).Should(Succeed())

antreaConfig = &cniv1alpha2.AntreaConfig{}
antreaConfig = &cniv1alpha1.AntreaConfig{}
key := client.ObjectKey{Name: configName, Namespace: clusterNamespace}
err := k8sClient.Get(ctx, key, antreaConfig)
Expect(err).ToNot(HaveOccurred())
Expand All @@ -573,17 +573,17 @@ var _ = Describe("AntreaConfig Reconciler and Webhooks", func() {
})
})

func generateAntreaConfig(name, namespace string, datavalues *cniv1alpha2.AntreaConfigDataValue) *cniv1alpha2.AntreaConfig {
func generateAntreaConfig(name, namespace string, datavalues *cniv1alpha1.AntreaConfigDataValue) *cniv1alpha1.AntreaConfig {
labels := map[string]string{}
labels["tkg.tanzu.vmware.com/package-name"] = "antrea.tanzu.vmware.com.1.7.2---tkg.1-advanced"
config := &cniv1alpha2.AntreaConfig{
config := &cniv1alpha1.AntreaConfig{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: namespace,
Labels: labels,
},
Spec: cniv1alpha2.AntreaConfigSpec{
Antrea: cniv1alpha2.Antrea{
Spec: cniv1alpha1.AntreaConfigSpec{
Antrea: cniv1alpha1.Antrea{
AntreaConfigDataValue: *datavalues,
},
},
Expand Down
18 changes: 9 additions & 9 deletions addons/controllers/clusterbootstrap_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
addontypes "github.com/vmware-tanzu/tanzu-framework/addons/pkg/types"
"github.com/vmware-tanzu/tanzu-framework/addons/pkg/util"
"github.com/vmware-tanzu/tanzu-framework/addons/test/builder"
antreaconfigv1alpha2 "github.com/vmware-tanzu/tanzu-framework/apis/addonconfigs/cni/v1alpha2"
antreaconfigv1alpha1 "github.com/vmware-tanzu/tanzu-framework/apis/addonconfigs/cni/v1alpha1"
kvcpiv1alpha1 "github.com/vmware-tanzu/tanzu-framework/apis/addonconfigs/cpi/v1alpha1"
vspherecpiv1alpha1 "github.com/vmware-tanzu/tanzu-framework/apis/addonconfigs/cpi/v1alpha1"
vspherecsiv1alpha1 "github.com/vmware-tanzu/tanzu-framework/apis/addonconfigs/csi/v1alpha1"
Expand Down Expand Up @@ -921,7 +921,7 @@ var _ = Describe("ClusterBootstrap Reconciler", func() {

When("Cluster is created", func() {

var routableAntreaConfig *antreaconfigv1alpha2.AntreaConfig
var routableAntreaConfig *antreaconfigv1alpha1.AntreaConfig

BeforeEach(func() {
clusterName = "test-cluster-tcbt-3"
Expand All @@ -937,17 +937,17 @@ var _ = Describe("ClusterBootstrap Reconciler", func() {
Expect(apierrors.IsAlreadyExists(err)).To(BeTrue())
}

routableAntreaConfig = &antreaconfigv1alpha2.AntreaConfig{
routableAntreaConfig = &antreaconfigv1alpha1.AntreaConfig{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%s-antrea-package", clusterName),
Namespace: clusterNamespace,
},
Spec: antreaconfigv1alpha2.AntreaConfigSpec{
Antrea: antreaconfigv1alpha2.Antrea{
AntreaConfigDataValue: antreaconfigv1alpha2.AntreaConfigDataValue{
Spec: antreaconfigv1alpha1.AntreaConfigSpec{
Antrea: antreaconfigv1alpha1.Antrea{
AntreaConfigDataValue: antreaconfigv1alpha1.AntreaConfigDataValue{
TrafficEncapMode: "hybrid",
NoSNAT: true,
FeatureGates: antreaconfigv1alpha2.AntreaFeatureGates{
FeatureGates: antreaconfigv1alpha1.AntreaFeatureGates{
AntreaProxy: true,
EndpointSlice: true,
},
Expand All @@ -956,7 +956,7 @@ var _ = Describe("ClusterBootstrap Reconciler", func() {
},
}
Expect(k8sClient.Create(ctx, routableAntreaConfig)).NotTo(HaveOccurred())
assertEventuallyExistInNamespace(ctx, k8sClient, clusterNamespace, routableAntreaConfig.Name, &antreaconfigv1alpha2.AntreaConfig{})
assertEventuallyExistInNamespace(ctx, k8sClient, clusterNamespace, routableAntreaConfig.Name, &antreaconfigv1alpha1.AntreaConfig{})
})

Context("with a routable AntreaConfig resource already exist", func() {
Expand All @@ -969,7 +969,7 @@ var _ = Describe("ClusterBootstrap Reconciler", func() {
return err == nil
}, waitTimeout, pollingInterval).Should(BeTrue())

antreaConfig := &antreaconfigv1alpha2.AntreaConfig{}
antreaConfig := &antreaconfigv1alpha1.AntreaConfig{}
// use the name from cloned clusterBootstrap to verify it is the same
assertOwnerReferencesExist(ctx, k8sClient, clusterNamespace, clusterBootstrap.Spec.CNI.ValuesFrom.ProviderRef.Name, antreaConfig, []metav1.OwnerReference{
{
Expand Down
6 changes: 0 additions & 6 deletions addons/controllers/suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ import (
"github.com/vmware-tanzu/tanzu-framework/addons/test/testutil"
addonwebhooks "github.com/vmware-tanzu/tanzu-framework/addons/webhooks"
cniv1alpha1 "github.com/vmware-tanzu/tanzu-framework/apis/addonconfigs/cni/v1alpha1"
cniv1alpha2 "github.com/vmware-tanzu/tanzu-framework/apis/addonconfigs/cni/v1alpha2"
cpiv1alpha1 "github.com/vmware-tanzu/tanzu-framework/apis/addonconfigs/cpi/v1alpha1"
csiv1alpha1 "github.com/vmware-tanzu/tanzu-framework/apis/addonconfigs/csi/v1alpha1"
runtanzuv1alpha1 "github.com/vmware-tanzu/tanzu-framework/apis/run/v1alpha1"
Expand Down Expand Up @@ -213,9 +212,6 @@ var _ = BeforeSuite(func(done Done) {
err = cniv1alpha1.AddToScheme(scheme)
Expect(err).NotTo(HaveOccurred())

err = cniv1alpha2.AddToScheme(scheme)
Expect(err).NotTo(HaveOccurred())

err = cpiv1alpha1.AddToScheme(scheme)
Expect(err).NotTo(HaveOccurred())

Expand Down Expand Up @@ -455,8 +451,6 @@ var _ = BeforeSuite(func(done Done) {
// Set up the webhooks in the manager
err = (&cniv1alpha1.AntreaConfig{}).SetupWebhookWithManager(mgr)
Expect(err).ToNot(HaveOccurred())
err = (&cniv1alpha2.AntreaConfig{}).SetupWebhookWithManager(mgr)
Expect(err).ToNot(HaveOccurred())
err = (&cniv1alpha1.CalicoConfig{}).SetupWebhookWithManager(mgr)
Expect(err).ToNot(HaveOccurred())
err = (&addonwebhooks.ClusterPause{Client: k8sClient}).SetupWebhookWithManager(mgr)
Expand Down
2 changes: 1 addition & 1 deletion addons/controllers/testdata/antrea-custom-cb-2-resources.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
kind: AntreaConfig
name: antrea-config-template-2
---
apiVersion: cni.tanzu.vmware.com/v1alpha2
apiVersion: cni.tanzu.vmware.com/v1alpha1
kind: AntreaConfig
metadata:
name: antrea-config-template-2
Expand Down
2 changes: 1 addition & 1 deletion addons/controllers/testdata/antrea-custom-tkg-system.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
kind: AntreaConfig
name: antrea-config-template
---
apiVersion: cni.tanzu.vmware.com/v1alpha2
apiVersion: cni.tanzu.vmware.com/v1alpha1
kind: AntreaConfig
metadata:
name: antrea-config-template
Expand Down
2 changes: 1 addition & 1 deletion addons/controllers/testdata/antrea-test-2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ kind: DockerCluster
metadata:
name: test-cluster-5
---
apiVersion: cni.tanzu.vmware.com/v1alpha2
apiVersion: cni.tanzu.vmware.com/v1alpha1
kind: AntreaConfig
metadata:
name: test-cluster-5-antrea-package
Expand Down
2 changes: 1 addition & 1 deletion addons/controllers/testdata/antrea-test-template-config-1.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: cni.tanzu.vmware.com/v1alpha2
apiVersion: cni.tanzu.vmware.com/v1alpha1
kind: AntreaConfig
metadata:
name: test-cluster-4-antrea-package
Expand Down
2 changes: 1 addition & 1 deletion addons/controllers/testdata/test-cluster-bootstrap-10.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ spec:
openAPIv3:
title: foobar.tanzu.vmware.com.0.2.5+vmware.1-tkg.1 values schema
---
apiVersion: cni.tanzu.vmware.com/v1alpha2
apiVersion: cni.tanzu.vmware.com/v1alpha1
kind: AntreaConfig
metadata:
name: antrea-config-custom-1
Expand Down
2 changes: 1 addition & 1 deletion addons/controllers/testdata/test-cluster-bootstrap-2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ stringData:
values.yaml: |
sample-key: sample-value
---
apiVersion: cni.tanzu.vmware.com/v1alpha2
apiVersion: cni.tanzu.vmware.com/v1alpha1
kind: AntreaConfig
metadata:
name: test-cluster-tcbt-2
Expand Down
Loading

0 comments on commit 7081502

Please sign in to comment.