Skip to content

Commit

Permalink
Update to pulumi v3.6.0 & misc (#159)
Browse files Browse the repository at this point in the history
Update pulumi sdk & docker base to v3.6.0
Update deployment manifests
Update dependencies
Remove imagePullSecrets and imagePullPolicy from operator template
Set default log level to error in deploy manifests

Fix #154
  • Loading branch information
elsesiy authored Jul 1, 2021
1 parent 9e9529b commit 9a62c7c
Show file tree
Hide file tree
Showing 11 changed files with 79 additions and 56 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ CHANGELOG
## HEAD (Unreleased)
(None)

- Update deployment manifests & code for pulumi v3.6.0 [#159](https://github.com/pulumi/pulumi-kubernetes-operator/pull/159)

---

## 0.0.13 (2021-05-25)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM pulumi/pulumi:v3.3.1
FROM pulumi/pulumi:v3.6.0

ENV OPERATOR=/usr/local/bin/pulumi-kubernetes-operator

Expand Down
1 change: 0 additions & 1 deletion deploy/crds/pulumi.com_stacks.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down
6 changes: 2 additions & 4 deletions deploy/operator_template.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand All @@ -14,17 +15,14 @@ spec:
name: pulumi-kubernetes-operator
spec:
serviceAccountName: pulumi-kubernetes-operator
imagePullSecrets:
- name: pulumi-kubernetes-operator
volumes:
- name: tmp-dir
emptyDir: {}
containers:
- name: pulumi-kubernetes-operator
image: <IMG_NAME>:<IMG_VERSION>
args:
- "--zap-level=info"
imagePullPolicy: Always
- "--zap-level=error"
volumeMounts:
- mountPath: /tmp
name: tmp-dir
Expand Down
8 changes: 3 additions & 5 deletions deploy/yaml/operator.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand All @@ -14,17 +15,14 @@ spec:
name: pulumi-kubernetes-operator
spec:
serviceAccountName: pulumi-kubernetes-operator
imagePullSecrets:
- name: pulumi-kubernetes-operator
volumes:
- name: tmp-dir
emptyDir: {}
containers:
- name: pulumi-kubernetes-operator
image: pulumi/pulumi-kubernetes-operator:v0.0.11
image: pulumi/pulumi-kubernetes-operator:v0.0.13
args:
- "--zap-level=info"
imagePullPolicy: Always
- "--zap-level=error"
volumeMounts:
- mountPath: /tmp
name: tmp-dir
Expand Down
2 changes: 1 addition & 1 deletion deploy/yaml/role.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
creationTimestamp: null
name: pulumi-kubernetes-operator
rules:
- apiGroups:
Expand Down
1 change: 1 addition & 0 deletions deploy/yaml/role_binding.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
Expand Down
1 change: 1 addition & 0 deletions deploy/yaml/service_account.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: v1
kind: ServiceAccount
metadata:
Expand Down
4 changes: 2 additions & 2 deletions docs/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ Quickly build the operator to check that it compiles.

This runs a fast build that is dynamically-linked.

```
```bash
make build
```

### Install CRD

Codegen and Install the CRD in your existing Kubernetes cluster.

```
```bash
make codegen install-crds
```

Expand Down
16 changes: 7 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,26 @@ go 1.16

require (
github.com/go-logr/logr v0.1.0
github.com/onsi/ginkgo v1.14.0
github.com/onsi/gomega v1.10.1
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.13.0
github.com/operator-framework/operator-lib v0.0.0-20200728190837-b76db547798d
github.com/operator-framework/operator-sdk v0.19.0
github.com/pkg/errors v0.9.1
github.com/pulumi/pulumi/sdk/v3 v3.3.1
github.com/pulumi/pulumi/sdk/v3 v3.6.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
github.com/whilp/git-urls v1.0.0
golang.org/x/tools v0.0.0-20200617161249-6222995d070a // indirect
gopkg.in/src-d/go-git.v4 v4.13.1
k8s.io/api v0.18.4
k8s.io/apiextensions-apiserver v0.18.4
k8s.io/apimachinery v0.18.4
k8s.io/api v0.18.19
k8s.io/apiextensions-apiserver v0.18.19
k8s.io/apimachinery v0.18.19
k8s.io/client-go v12.0.0+incompatible
sigs.k8s.io/controller-runtime v0.6.1
sigs.k8s.io/controller-tools v0.3.0 // indirect
)

replace (
github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible // Required by OLM
k8s.io/client-go => k8s.io/client-go v0.18.2 // Required by prometheus-operator
k8s.io/client-go => k8s.io/client-go v0.18.19 // Required by prometheus-operator
)

// This replaced version includes controller-runtime predicate utilities necessary for v1.0.0 that are still in master.
Expand Down
92 changes: 59 additions & 33 deletions go.sum

Large diffs are not rendered by default.

0 comments on commit 9a62c7c

Please sign in to comment.