Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: gracefully handle private IP only AppGW in 1.5 #1617

Open
wants to merge 1 commit into
base: release/1.5
Choose a base branch
from
Open
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
4 changes: 0 additions & 4 deletions cmd/appgw-ingress/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,6 @@ func main() {

// fatal config validations
appGw, _ := azClient.GetGateway()
if err := appgw.FatalValidateOnExistingConfig(recorder, appGw.ApplicationGatewayPropertiesFormat, env); err != nil {
klog.Fatal("Got a fatal validation error on existing Application Gateway config. Please update Application Gateway or the controller's helm config. Error:", err)
}

if _, exists := allowedSkus[appGw.Sku.Tier]; !exists {
errorLine := fmt.Sprintf("App Gateway SKU Tier %s is not supported by AGIC version %s; (v0.10.0 supports App Gwy v1)", appGw.Sku.Tier, appgw.GetVersion())
if agicPod != nil {
Expand Down
4 changes: 4 additions & 0 deletions pkg/controller/mutate_app_gateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ func (c AppGwIngressController) MutateAppGateway(event events.Event, appGw *n.Ap
if c.agicPod != nil {
c.recorder.Event(c.agicPod, v1.EventTypeWarning, events.ReasonInvalidAppGwConfig, errorLine)
}

for _, ingress := range cbCtx.IngressList {
c.recorder.Event(ingress, v1.EventTypeWarning, events.ReasonInvalidAppGwConfig, errorLine)
}
return err
}
// -------------------------- //
Expand Down