Skip to content

Commit

Permalink
Prep v1.2.0 release (#237)
Browse files Browse the repository at this point in the history
* Prep v1.2.0 release

* Add comment
  • Loading branch information
Vivek Lakshmanan authored Nov 4, 2021
1 parent 9829d85 commit ccc1132
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 9 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ CHANGELOG
=========

## HEAD (Unreleased)
(None)

## 1.2.0 (2021-11-04)
- Default timestamps are now iso8601 in logs. Remove `"--zap-time-encoding=iso8601"` line from deployment spec to revert to old timestamps [#234](https://github.com/pulumi/pulumi-kubernetes-operator/pull/234)
- Add some basic event publishing [#235](https://github.com/pulumi/pulumi-kubernetes-operator/pull/235)
- Upgrade to v3.17.0 of Pulumi [#236](https://github.com/pulumi/pulumi-kubernetes-operator/pull/236)
Expand Down
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ GIT_COMMIT := $(shell git rev-parse --short HEAD)
VERSION := $(GIT_COMMIT)
PUBLISH_IMAGE_NAME := pulumi/pulumi-kubernetes-operator
IMAGE_NAME := docker.io/$(shell whoami)/pulumi-kubernetes-operator
CURRENT_RELEASE := $(shell git describe --abbrev=0 --tags)
RELEASE ?= $(shell git describe --abbrev=0 --tags)

default: build
Expand Down Expand Up @@ -48,6 +49,12 @@ deploy:
kubectl apply -f deploy/yaml/role_binding.yaml
sed -e "s#<IMG_NAME>:<IMG_VERSION>#$(IMAGE_NAME):$(VERSION)#g" deploy/operator_template.yaml | kubectl apply -f -

# Run make prep RELEASE=<next-tag> to prep next release
prep: prep-spec prep-docs

prep-docs:
sed -i '' -e "s|$(CURRENT_RELEASE)|$(RELEASE)|g" README.md

# Run make prep-spec RELEASE=<next-tag> to prep the spec
prep-spec:
sed -e "s#<IMG_NAME>:<IMG_VERSION>#$(PUBLISH_IMAGE_NAME):$(RELEASE)#g" deploy/operator_template.yaml > deploy/yaml/operator.yaml
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ kubectl apply -f deploy/yaml
import * as pulumi from "@pulumi/pulumi";
import * as kubernetes from "@pulumi/kubernetes";

const crds = new kubernetes.yaml.ConfigFile("crds", {file: "https://raw.githubusercontent.com/pulumi/pulumi-kubernetes-operator/v1.1.0/deploy/crds/pulumi.com_stacks.yaml"});
const crds = new kubernetes.yaml.ConfigFile("crds", {file: "https://raw.githubusercontent.com/pulumi/pulumi-kubernetes-operator/v1.2.0/deploy/crds/pulumi.com_stacks.yaml"});

const operatorServiceAccount = new kubernetes.core.v1.ServiceAccount("operatorServiceAccount", {metadata: {
name: "pulumi-kubernetes-operator",
Expand Down Expand Up @@ -266,7 +266,7 @@ const operatorDeployment = new kubernetes.apps.v1.Deployment("operatorDeployment
}],
containers: [{
name: "pulumi-kubernetes-operator",
image: "pulumi/pulumi-kubernetes-operator:v1.1.0",
image: "pulumi/pulumi-kubernetes-operator:v1.2.0",
args: ["--zap-level=debug"],
imagePullPolicy: "Always",
env: [
Expand Down Expand Up @@ -324,7 +324,7 @@ def delete_status():
return f

crds = kubernetes.yaml.ConfigFile("crds",
file="https://raw.githubusercontent.com/pulumi/pulumi-kubernetes-operator/v1.1.0/deploy/crds/pulumi.com_stacks.yaml",
file="https://raw.githubusercontent.com/pulumi/pulumi-kubernetes-operator/v1.2.0/deploy/crds/pulumi.com_stacks.yaml",
transformations=[delete_status()])

operator_service_account = kubernetes.core.v1.ServiceAccount("operatorServiceAccount", metadata={
Expand Down Expand Up @@ -463,7 +463,7 @@ operator_deployment = kubernetes.apps.v1.Deployment("operatorDeployment",
}],
"containers": [{
"name": "pulumi-kubernetes-operator",
"image": "pulumi/pulumi-kubernetes-operator:v1.1.0",
"image": "pulumi/pulumi-kubernetes-operator:v1.2.0",
"command": ["pulumi-kubernetes-operator"],
"args": ["--zap-level=debug"],
"image_pull_policy": "Always",
Expand Down Expand Up @@ -522,7 +522,7 @@ class MyStack : Stack
public MyStack()
{
var crds = new Kubernetes.Yaml.ConfigFile("crds", new Kubernetes.Yaml.ConfigFileArgs{
File = "https://raw.githubusercontent.com/pulumi/pulumi-kubernetes-operator/v1.1.0/deploy/crds/pulumi.com_stacks.yaml"
File = "https://raw.githubusercontent.com/pulumi/pulumi-kubernetes-operator/v1.2.0/deploy/crds/pulumi.com_stacks.yaml"
});

var operatorServiceAccount = new Kubernetes.Core.V1.ServiceAccount("operatorServiceAccount", new ServiceAccountArgs
Expand Down Expand Up @@ -760,7 +760,7 @@ class MyStack : Stack
new ContainerArgs
{
Name = "pulumi-kubernetes-operator",
Image = "pulumi/pulumi-kubernetes-operator:v1.1.0",
Image = "pulumi/pulumi-kubernetes-operator:v1.2.0",
Command =
{
"pulumi-kubernetes-operator",
Expand Down Expand Up @@ -841,7 +841,7 @@ import (
func main() {
pulumi.Run(func(ctx *pulumi.Context) error {
crds, err := yaml.NewConfigFile(ctx, "crds", &yaml.ConfigFileArgs{
File: "https://raw.githubusercontent.com/pulumi/pulumi-kubernetes-operator/v1.1.0/deploy/crds/pulumi.com_stacks.yaml",
File: "https://raw.githubusercontent.com/pulumi/pulumi-kubernetes-operator/v1.2.0/deploy/crds/pulumi.com_stacks.yaml",
})
if err != nil {
return err
Expand Down Expand Up @@ -1035,7 +1035,7 @@ func main() {
Containers: corev1.ContainerArray{
&corev1.ContainerArgs{
Name: pulumi.String("pulumi-kubernetes-operator"),
Image: pulumi.String("pulumi/pulumi-kubernetes-operator:v1.1.0"),
Image: pulumi.String("pulumi/pulumi-kubernetes-operator:v1.2.0"),
Command: pulumi.StringArray{
pulumi.String("pulumi-kubernetes-operator"),
},
Expand Down
2 changes: 1 addition & 1 deletion deploy/yaml/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
emptyDir: {}
containers:
- name: pulumi-kubernetes-operator
image: pulumi/pulumi-kubernetes-operator:v1.1.0
image: pulumi/pulumi-kubernetes-operator:v1.2.0
args:
- "--zap-level=error"
- "--zap-time-encoding=iso8601"
Expand Down

0 comments on commit ccc1132

Please sign in to comment.