diff --git a/cni/Dockerfile b/cni/Dockerfile index e67b453456..a121f2f318 100644 --- a/cni/Dockerfile +++ b/cni/Dockerfile @@ -6,7 +6,7 @@ ARG OS_VERSION ARG OS # mcr.microsoft.com/oss/go/microsoft/golang:1.23-azurelinux3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:52da06982153e87569d588c8d25dc519903e92f740fc0d7770f38dfd9f7bb0f2 AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:2ee838d78b546ea43bec72051656ef74c98e6ae17f55be4fb45bd5d9add6dddf AS go # mcr.microsoft.com/azurelinux/base/core:3.0 FROM --platform=linux/${ARCH} mcr.microsoft.com/azurelinux/base/core@sha256:e9bb4e5a79123f2ae29dc601f68adf63a636a455c4259423712b06b798cb201e AS mariner-core diff --git a/cns/Dockerfile b/cns/Dockerfile index 7e132e6632..3f834c42a7 100644 --- a/cns/Dockerfile +++ b/cns/Dockerfile @@ -5,7 +5,7 @@ ARG OS_VERSION ARG OS # mcr.microsoft.com/oss/go/microsoft/golang:1.23-azurelinux3.0 -FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:52da06982153e87569d588c8d25dc519903e92f740fc0d7770f38dfd9f7bb0f2 AS go +FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:2ee838d78b546ea43bec72051656ef74c98e6ae17f55be4fb45bd5d9add6dddf AS go # mcr.microsoft.com/azurelinux/base/core:3.0 FROM mcr.microsoft.com/azurelinux/base/core@sha256:e9bb4e5a79123f2ae29dc601f68adf63a636a455c4259423712b06b798cb201e AS mariner-core diff --git a/crd/overlayextensionconfig/api/v1alpha1/overlayextensionconfig_types.go b/crd/overlayextensionconfig/api/v1alpha1/overlayextensionconfig_types.go index 8744327553..83592ae6a4 100644 --- a/crd/overlayextensionconfig/api/v1alpha1/overlayextensionconfig_types.go +++ b/crd/overlayextensionconfig/api/v1alpha1/overlayextensionconfig_types.go @@ -38,11 +38,6 @@ type OverlayExtensionConfigSpec struct { // +kubebuilder:validation:MaxLength=43 // 43 is max length of IPv6 CIDR string ExtensionIPRange string `json:"extensionIPRange,omitempty"` - - // AppGatewaySubnetGUID field defines a subnet delegated to Application Gateway that should be able to reach routing domain ip addresses. This needs to be a valid GUID. - // +kubebuilder:validation:Optional - // +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable" - AppGatewaySubnetGUID string `json:"appGatewaySubnetGUID,omitempty"` } type OECState string diff --git a/crd/overlayextensionconfig/manifests/acn.azure.com_overlayextensionconfigs.yaml b/crd/overlayextensionconfig/manifests/acn.azure.com_overlayextensionconfigs.yaml index eeb57a5283..418691c2af 100644 --- a/crd/overlayextensionconfig/manifests/acn.azure.com_overlayextensionconfigs.yaml +++ b/crd/overlayextensionconfig/manifests/acn.azure.com_overlayextensionconfigs.yaml @@ -47,14 +47,6 @@ spec: spec: description: OverlayExtensionConfigSpec defines the desired state of OverlayExtensionConfig. properties: - appGatewaySubnetGUID: - description: AppGatewaySubnetGUID field defines a subnet delegated - to Application Gateway that should be able to reach routing domain - ip addresses. This needs to be a valid GUID. - type: string - x-kubernetes-validations: - - message: Value is immutable - rule: self == oldSelf extensionIPRange: description: |- ExtensionIPRange field defines a CIDR that should be able to reach routing domain ip addresses.