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

Don't render emoji on Windows. #634

Merged
merged 1 commit into from
Jul 16, 2019
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
14 changes: 12 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
## 0.25.3 (Unreleased)

### Supported Kubernetes versions

- v1.15.x
- v1.14.x
- v1.13.x

### Bug fixes

- Don't render emoji on Windows. (https://github.com/pulumi/pulumi-kubernetes/pull/634)

## 0.25.2 (July 11, 2019)

### Supported Kubernetes versions
Expand All @@ -10,7 +20,7 @@

### Improvements

- The Kubernetes provider can now communicate detailed information about the difference between a resource's
- The Kubernetes provider can now communicate detailed information about the difference between a resource's
desired and actual state during a Pulumi update. (https://github.com/pulumi/pulumi-kubernetes/pull/618).
- Refactor Pod await logic for easier testing and maintenance (https://github.com/pulumi/pulumi-kubernetes/pull/590).
- Update to client-go v12.0.0 (https://github.com/pulumi/pulumi-kubernetes/pull/621).
Expand Down Expand Up @@ -72,7 +82,7 @@ desired and actual state during a Pulumi update. (https://github.com/pulumi/pulu

BREAKING: This release changes the behavior of the provider `namespace` flag introduced
in `0.23.0`. Previously, this flag was treated as an override, which ignored namespace
values set directly on resources. Now, the flag is a default, and will only set the
values set directly on resources. Now, the flag is a default, and will only set the
namespace if one is not already set. If you have created resources using a provider
with the `namespace` flag set, this change may cause these resources to be recreated
on the next update.
Expand Down
8 changes: 6 additions & 2 deletions pkg/await/apps_deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
"strings"
"time"

"github.com/pulumi/pulumi/pkg/util/cmdutil"

"github.com/golang/glog"
"github.com/pkg/errors"
"github.com/pulumi/pulumi-kubernetes/pkg/await/states"
Expand Down Expand Up @@ -342,7 +344,8 @@ func (dia *deploymentInitAwaiter) checkAndLogStatus() bool {
return false
}

dia.config.logStatus(diag.Info, "✅ Deployment initialization complete")
dia.config.logStatus(diag.Info,
fmt.Sprintf("%sDeployment initialization complete", cmdutil.EmojiOr("✅ ", "")))
return true
}
} else {
Expand All @@ -351,7 +354,8 @@ func (dia *deploymentInitAwaiter) checkAndLogStatus() bool {
return false
}

dia.config.logStatus(diag.Info, "✅ Deployment initialization complete")
dia.config.logStatus(diag.Info,
fmt.Sprintf("%sDeployment initialization complete", cmdutil.EmojiOr("✅ ", "")))
return true
}
}
Expand Down
5 changes: 4 additions & 1 deletion pkg/await/apps_statefulset.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import (
"reflect"
"time"

"github.com/pulumi/pulumi/pkg/util/cmdutil"

"github.com/golang/glog"
"github.com/pkg/errors"
"github.com/pulumi/pulumi-kubernetes/pkg/await/states"
Expand Down Expand Up @@ -258,7 +260,8 @@ func (sia *statefulsetInitAwaiter) await(
// the provider.
func (sia *statefulsetInitAwaiter) checkAndLogStatus() bool {
if sia.replicasReady && sia.revisionReady {
sia.config.logStatus(diag.Info, "✅ StatefulSet initialization complete")
sia.config.logStatus(diag.Info,
fmt.Sprintf("%sStatefulSet initialization complete", cmdutil.EmojiOr("✅ ", "")))
return true
}

Expand Down
8 changes: 6 additions & 2 deletions pkg/await/core_service.go
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
package await

import (
"fmt"
"reflect"
"time"

"github.com/pulumi/pulumi/pkg/util/cmdutil"

"github.com/golang/glog"
"github.com/pkg/errors"
"github.com/pulumi/pulumi-kubernetes/pkg/clients"
"github.com/pulumi/pulumi-kubernetes/pkg/kinds"
"github.com/pulumi/pulumi-kubernetes/pkg/metadata"
"github.com/pulumi/pulumi-kubernetes/pkg/openapi"
"github.com/pulumi/pulumi/pkg/diag"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -426,7 +429,8 @@ func (sia *serviceInitAwaiter) checkAndLogStatus(version serverVersion) bool {

success := sia.serviceReady && sia.endpointsSettled && sia.endpointsReady
if success {
sia.config.logStatus(diag.Info, "✅ Service initialization complete")
sia.config.logStatus(diag.Info,
fmt.Sprintf("%sService initialization complete", cmdutil.EmojiOr("✅ ", "")))
} else if sia.endpointsSettled && sia.endpointsReady {
sia.config.logStatus(diag.Info, "[2/3] Attempting to allocate IP address to Service")
}
Expand Down
5 changes: 4 additions & 1 deletion pkg/await/extensions_ingress.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
"reflect"
"time"

"github.com/pulumi/pulumi/pkg/util/cmdutil"

"github.com/golang/glog"
"github.com/pkg/errors"
"github.com/pulumi/pulumi-kubernetes/pkg/clients"
Expand Down Expand Up @@ -402,7 +404,8 @@ func (iia *ingressInitAwaiter) errorMessages() []string {
func (iia *ingressInitAwaiter) checkAndLogStatus() bool {
success := iia.ingressReady && iia.checkIfEndpointsReady()
if success {
iia.config.logStatus(diag.Info, "✅ Ingress initialization complete")
iia.config.logStatus(diag.Info,
fmt.Sprintf("%sIngress initialization complete", cmdutil.EmojiOr("✅ ", "")))
} else if iia.checkIfEndpointsReady() {
iia.config.logStatus(diag.Info, "[2/3] Waiting for update of .status.loadBalancer with hostname/IP")
}
Expand Down