Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions docs/book/src/managed/managedcluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -331,11 +331,7 @@ metadata:
spec:
extensions:
- name: my-extension
extensionType: "TraefikLabs.TraefikProxy"
plan:
name: "traefik-proxy"
product: "traefik-proxy"
publisher: "containous"
extensionType: "microsoft.flux"
```

To list all of the available extensions for your cluster as well as its plan details, use the following az cli command:
Expand Down
14 changes: 1 addition & 13 deletions test/e2e/aks_marketplace.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ type AKSMarketplaceExtensionSpecInput struct {
}

const (
extensionName = "AKS-marketplace-extension" // Test that upper case name is allowed
officialExtensionName = "official-aks-extension"
)

Expand Down Expand Up @@ -130,7 +129,7 @@ func AKSMarketplaceExtensionSpec(ctx context.Context, inputGetter func() AKSMark
}, input.WaitIntervals...).Should(Succeed())
Eventually(checkTaints, input.WaitIntervals...).Should(Succeed())

By("Adding an official AKS Extension & AKS Marketplace Extension to the AzureManagedControlPlane")
By("Adding an official AKS Extension to the AzureManagedControlPlane")
var infraControlPlane = &infrav1.AzureManagedControlPlane{}
Eventually(func(g Gomega) {
err = mgmtClient.Get(ctx, client.ObjectKey{
Expand All @@ -139,15 +138,6 @@ func AKSMarketplaceExtensionSpec(ctx context.Context, inputGetter func() AKSMark
}, infraControlPlane)
g.Expect(err).NotTo(HaveOccurred())
infraControlPlane.Spec.Extensions = []infrav1.AKSExtension{
{
Name: extensionName,
ExtensionType: ptr.To("TraefikLabs.TraefikProxy"),
Plan: &infrav1.ExtensionPlan{
Name: "traefik-proxy",
Product: "traefik-proxy",
Publisher: "containous",
},
},
{
Name: officialExtensionName,
ExtensionType: ptr.To("microsoft.flux"),
Expand All @@ -164,7 +154,6 @@ func AKSMarketplaceExtensionSpec(ctx context.Context, inputGetter func() AKSMark
}, input.WaitIntervals...).Should(Succeed())

By("Ensuring the AKS Marketplace Extension is added to the AzureManagedControlPlane")
ensureAKSExtensionAdded(ctx, input, extensionName, "TraefikLabs.TraefikProxy", extensionClient, amcp)
ensureAKSExtensionAdded(ctx, input, officialExtensionName, "microsoft.flux", extensionClient, amcp)

By("Deleting the AKS Marketplace Extension")
Expand All @@ -179,7 +168,6 @@ func AKSMarketplaceExtensionSpec(ctx context.Context, inputGetter func() AKSMark
}, input.WaitIntervals...).Should(Succeed())

By("Ensuring the AKS Marketplace Extension is deleted from the AzureManagedControlPlane")
ensureAKSExtensionDeleted(ctx, input, extensionName, extensionClient, amcp)
ensureAKSExtensionDeleted(ctx, input, officialExtensionName, extensionClient, amcp)

By("Restoring initial taints for Windows machine pool")
Expand Down