Skip to content

WIP: image-based containerapp deployment workaround #6422

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.

Sign up for GitHub

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

Draft
weikanglim wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WIP: image-based containerapp deployment workaround #6422

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 27 additions & 2 deletions cli/azd/pkg/containerapps/container_app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"context"
"encoding/json"
"fmt"
"io"
"log"
"net/http"
"slices"
Expand All @@ -34,6 +35,7 @@ const (
pathTemplate = "properties.template"
pathTemplateRevisionSuffix = "properties.template.revisionSuffix"
pathTemplateContainers = "properties.template.containers"
pathTemplateScaleRules = "properties.template.scale.rules"
pathConfigurationActiveRevisionsMode = "properties.configuration.activeRevisionsMode"
pathConfigurationSecrets = "properties.configuration.secrets"
pathConfigurationIngressTraffic = "properties.configuration.ingress.traffic"
Expand Down Expand Up @@ -307,8 +309,16 @@ func (cas *containerAppService) AddRevision(
}

var revisionMap map[string]any
if err := convert.FromHttpResponse(revisionResponse, &revisionMap); err != nil {
return err
body, err := io.ReadAll(revisionResponse.Body)
if err != nil {
return fmt.Errorf("failed to read response body: %w", err)
}

log.Println("GET revision response:", string(body))

revisionResponse.Body.Close()
if err := json.Unmarshal(body, &revisionMap); err != nil {
return fmt.Errorf("failed to unmarshal response body: %w", err)
}

revision := config.NewConfig(revisionMap)
Expand Down Expand Up @@ -376,6 +386,17 @@ func (cas *containerAppService) AddRevision(
return fmt.Errorf("syncing secrets: %w", err)
}

kind, ok := containerApp.GetString("kind")
if ok && strings.Contains(kind, "functionapp") {
scaleRules, ok := containerApp.Get(pathTemplateScaleRules)
if ok && scaleRules != nil {
scaleRulesStr, _ := json.Marshal(scaleRules)
log.Println("Removing scale rules:", string(scaleRulesStr))
}

_ = containerApp.Unset(pathTemplateScaleRules)
}

// Update the container app
err = cas.updateContainerApp(ctx, subscriptionId, resourceGroupName, appName, containerApp, options)
if err != nil {
Expand All @@ -389,6 +410,8 @@ func (cas *containerAppService) AddRevision(

// If the container app is in multiple revision mode, update the traffic to point to the new revision
if revisionMode == string(armappcontainers.ActiveRevisionsModeMultiple) {
log.Println("Setting traffic to new revision in multi-revision mode")

revisionSuffix, ok := revision.GetString(pathTemplateRevisionSuffix)
if !ok {
return fmt.Errorf("getting revision suffix: %w", err)
Expand Down Expand Up @@ -527,6 +550,8 @@ func (cas *containerAppService) updateContainerApp(
return fmt.Errorf("marshalling container app: %w", err)
}

log.Println("PATCH revision request:", string(containerAppJson))

apiVersionPolicy := createApiVersionPolicy(options)
if apiVersionPolicy != nil {
apiVersionPolicy.body = (*json.RawMessage)(&containerAppJson)
Expand Down
Loading