Skip to content

Commit

Permalink
Update fallback container tag. (temporary fix)
Browse files Browse the repository at this point in the history
  • Loading branch information
johnstairs committed Oct 6, 2023
1 parent a643bf2 commit 262f851
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ install-cli:
tag=$$(git describe --tags 2> /dev/null || echo "0.0.0")
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go install -ldflags="-s -w \
-X main.version=$${tag} \
-X github.com/microsoft/tyger/cli/internal/install.officialContainerRegistry=$${official_container_registry}" \
-X github.com/microsoft/tyger/cli/internal/install.containerRegistry=$${official_container_registry}" \
./cmd/tyger ./cmd/buffer-sidecar ./cmd/tyger-proxy

cli-ready: install-cli
Expand Down
18 changes: 9 additions & 9 deletions cli/internal/install/helm.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (

var (
// set during build but we provide defaults so that there is some value when debugging
officialContainerRegistry string = "tyger.azurecr.io"
officialContainerImageTag string = "v0.1.0-19-g2d156b1"
containerRegistry string = "tyger.azurecr.io"
containerImageTag string = "v0.1.0-49-g5526c35"
)

func installTraefik(ctx context.Context, restConfigPromise *Promise[*rest.Config]) (any, error) {
Expand Down Expand Up @@ -189,11 +189,11 @@ func installNvidiaDevicePlugin(ctx context.Context, restConfigPromise *Promise[*
}

func InstallTyger(ctx context.Context) error {
if officialContainerRegistry == "" {
if containerRegistry == "" {
panic("officialContainerRegistry not set during build")
}

if officialContainerImageTag == "" {
if containerImageTag == "" {
panic("officialContainerImageTag not set during build")
}

Expand All @@ -211,13 +211,13 @@ func InstallTyger(ctx context.Context) error {

helmConfig := HelmChartConfig{
Namespace: TygerNamespace,
ChartRef: fmt.Sprintf("oci://%s/helm/tyger", officialContainerRegistry),
Version: officialContainerImageTag,
ChartRef: fmt.Sprintf("oci://%s/helm/tyger", containerRegistry),
Version: containerImageTag,
Values: map[string]any{
"server": map[string]any{
"image": fmt.Sprintf("%s/tyger-server:%s", officialContainerRegistry, officialContainerImageTag),
"bufferSidecarImage": fmt.Sprintf("%s/buffer-sidecar:%s", officialContainerRegistry, officialContainerImageTag),
"workerWaiterImage": fmt.Sprintf("%s/worker-waiter:%s", officialContainerRegistry, officialContainerImageTag),
"image": fmt.Sprintf("%s/tyger-server:%s", containerRegistry, containerImageTag),
"bufferSidecarImage": fmt.Sprintf("%s/buffer-sidecar:%s", containerRegistry, containerImageTag),
"workerWaiterImage": fmt.Sprintf("%s/worker-waiter:%s", containerRegistry, containerImageTag),
"hostname": config.Api.DomainName,
"security": map[string]any{
"enabled": true,
Expand Down

0 comments on commit 262f851

Please sign in to comment.