From ad8276f544d38550015adae17c56bef142bbf8e7 Mon Sep 17 00:00:00 2001 From: Michael Bridgen Date: Tue, 25 Oct 2022 17:22:13 +0100 Subject: [PATCH] Post v1.10.1 updates (#356) * Assign changelog entries to v1.10.1 * Update version in deploy/ projects Signed-off-by: Michael Bridgen --- CHANGELOG.md | 2 ++ deploy/deploy-operator-cs/MyStack.cs | 4 ++-- deploy/deploy-operator-go/main.go | 4 ++-- deploy/deploy-operator-py/__main__.py | 4 ++-- deploy/deploy-operator-ts/index.ts | 4 ++-- deploy/yaml/operator.yaml | 2 +- examples/flux-source/app/Pulumi.dev.yaml | 1 + examples/flux-source/index.ts | 6 ++++-- 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76602b95..d4ad690b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ CHANGELOG ## HEAD (Unreleased) +## 1.10.1 (2022-10-25) + - Give an example of using this operator with a Flux GitRepository and webhooks, in `examples/flux-source`. [#339](https://github.com/pulumi/pulumi-kubernetes-operator/pull/339) diff --git a/deploy/deploy-operator-cs/MyStack.cs b/deploy/deploy-operator-cs/MyStack.cs index 5008327f..fc31c8d6 100644 --- a/deploy/deploy-operator-cs/MyStack.cs +++ b/deploy/deploy-operator-cs/MyStack.cs @@ -10,7 +10,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.10.0/deploy/crds/pulumi.com_stacks.yaml" + File = "https://raw.githubusercontent.com/pulumi/pulumi-kubernetes-operator/v1.10.1/deploy/crds/pulumi.com_stacks.yaml" }); var operatorServiceAccount = new Kubernetes.Core.V1.ServiceAccount("operator-service-account", new ServiceAccountArgs{}); @@ -223,7 +223,7 @@ public MyStack() new ContainerArgs { Name = "pulumi-kubernetes-operator", - Image = "pulumi/pulumi-kubernetes-operator:v1.10.0", + Image = "pulumi/pulumi-kubernetes-operator:v1.10.1", Command = { "pulumi-kubernetes-operator", diff --git a/deploy/deploy-operator-go/main.go b/deploy/deploy-operator-go/main.go index 63782fa4..bb7c2ff4 100644 --- a/deploy/deploy-operator-go/main.go +++ b/deploy/deploy-operator-go/main.go @@ -20,7 +20,7 @@ import ( func main() { pulumi.Run(func(ctx *pulumi.Context) error { // Download file - filePath, cleanup, err := downloadFile("https://raw.githubusercontent.com/pulumi/pulumi-kubernetes-operator/v1.10.0/deploy/crds/pulumi.com_stacks.yaml") + filePath, cleanup, err := downloadFile("https://raw.githubusercontent.com/pulumi/pulumi-kubernetes-operator/v1.10.1/deploy/crds/pulumi.com_stacks.yaml") if err != nil { return err } @@ -203,7 +203,7 @@ func main() { Containers: corev1.ContainerArray{ &corev1.ContainerArgs{ Name: pulumi.String("pulumi-kubernetes-operator"), - Image: pulumi.String("pulumi/pulumi-kubernetes-operator:v1.10.0"), + Image: pulumi.String("pulumi/pulumi-kubernetes-operator:v1.10.1"), Command: pulumi.StringArray{ pulumi.String("pulumi-kubernetes-operator"), }, diff --git a/deploy/deploy-operator-py/__main__.py b/deploy/deploy-operator-py/__main__.py index 48361757..aac4abf2 100644 --- a/deploy/deploy-operator-py/__main__.py +++ b/deploy/deploy-operator-py/__main__.py @@ -10,7 +10,7 @@ def f(o): return f crds = kubernetes.yaml.ConfigFile("crds", - file="https://raw.githubusercontent.com/pulumi/pulumi-kubernetes-operator/v1.10.0/deploy/crds/pulumi.com_stacks.yaml", + file="https://raw.githubusercontent.com/pulumi/pulumi-kubernetes-operator/v1.10.1/deploy/crds/pulumi.com_stacks.yaml", transformations=[delete_status()]) operator_service_account = kubernetes.core.v1.ServiceAccount("operator-service-account") @@ -135,7 +135,7 @@ def f(o): "service_account_name": operator_service_account.metadata.name, "containers": [{ "name": "pulumi-kubernetes-operator", - "image": "pulumi/pulumi-kubernetes-operator:v1.10.0", + "image": "pulumi/pulumi-kubernetes-operator:v1.10.1", "command": ["pulumi-kubernetes-operator"], "args": ["--zap-level=error", "--zap-time-encoding=iso8601"], "image_pull_policy": "Always", diff --git a/deploy/deploy-operator-ts/index.ts b/deploy/deploy-operator-ts/index.ts index ad1fc4d9..0285ee01 100644 --- a/deploy/deploy-operator-ts/index.ts +++ b/deploy/deploy-operator-ts/index.ts @@ -1,7 +1,7 @@ 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.10.0/deploy/crds/pulumi.com_stacks.yaml"}); +const crds = new kubernetes.yaml.ConfigFile("crds", {file: "https://raw.githubusercontent.com/pulumi/pulumi-kubernetes-operator/v1.10.1/deploy/crds/pulumi.com_stacks.yaml"}); const operatorServiceAccount = new kubernetes.core.v1.ServiceAccount("operator-service-account"); const operatorRole = new kubernetes.rbac.v1.Role("operator-role", { @@ -127,7 +127,7 @@ const operatorDeployment = new kubernetes.apps.v1.Deployment("pulumi-kubernetes- serviceAccountName: operatorServiceAccount.metadata.name, containers: [{ name: "pulumi-kubernetes-operator", - image: "pulumi/pulumi-kubernetes-operator:v1.10.0", + image: "pulumi/pulumi-kubernetes-operator:v1.10.1", args: ["--zap-level=error", "--zap-time-encoding=iso8601"], imagePullPolicy: "Always", env: [ diff --git a/deploy/yaml/operator.yaml b/deploy/yaml/operator.yaml index 7167e01a..56f1510c 100644 --- a/deploy/yaml/operator.yaml +++ b/deploy/yaml/operator.yaml @@ -20,7 +20,7 @@ spec: emptyDir: {} containers: - name: pulumi-kubernetes-operator - image: pulumi/pulumi-kubernetes-operator:v1.10.0 + image: pulumi/pulumi-kubernetes-operator:v1.10.1 args: - "--zap-level=error" - "--zap-time-encoding=iso8601" diff --git a/examples/flux-source/app/Pulumi.dev.yaml b/examples/flux-source/app/Pulumi.dev.yaml index 576d9672..6531c8bc 100644 --- a/examples/flux-source/app/Pulumi.dev.yaml +++ b/examples/flux-source/app/Pulumi.dev.yaml @@ -1,2 +1,3 @@ config: app:git-url: https://github.com/squaremo/pko-dev + app:stack-name: squaremo/basic/dev diff --git a/examples/flux-source/index.ts b/examples/flux-source/index.ts index 9eaea16e..4ef883a3 100644 --- a/examples/flux-source/index.ts +++ b/examples/flux-source/index.ts @@ -3,11 +3,13 @@ import * as kubernetes from "@pulumi/kubernetes"; import { ConfigGroup } from "@pulumi/kubernetes/yaml"; import * as flux from "@worawat/flux"; +const defaultVersion = 'v1.10.1'; + const config = new pulumi.Config(); const deployNamespace = config.get("namespace") || 'default'; const deployNamespaceList = config.getObject("namespaces") || [deployNamespace]; -const operatorVersion = config.get("operator-version") || "v1.10.0"; -const crdVersion = config.get("crd-version") || "v1.10.0"; +const operatorVersion = config.get("operator-version") || defaultVersion; +const crdVersion = config.get("crd-version") || defaultVersion; // -- Flux installation