Skip to content

Commit 47532ba

Browse files
authored
[feat] Update operator bundle to upgrade, fix up documentation (#270)
* mage BuildBundle * moving updating to 1.21 outta here Signed-off-by: schristoff <[email protected]>
1 parent afad302 commit 47532ba

10 files changed

+69
-16
lines changed

config/crd/bases/getporter.org_agentactions.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.12.0
6+
controller-gen.kubebuilder.io/version: v0.12.1
77
name: agentactions.getporter.org
88
spec:
99
group: getporter.org

config/crd/bases/getporter.org_agentconfigs.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.12.0
6+
controller-gen.kubebuilder.io/version: v0.12.1
77
name: agentconfigs.getporter.org
88
spec:
99
group: getporter.org
@@ -102,6 +102,12 @@ spec:
102102
Porter will request when running the Porter Agent. It is used to
103103
determine what the storage class will be for the volume requested
104104
type: string
105+
ttlSecondsAfterFinished:
106+
default: 600
107+
description: TTLSecondsAfterFinished set the time limit of the lifetime
108+
of a Job that has finished execution.
109+
format: int32
110+
type: integer
105111
volumeSize:
106112
description: VolumeSize is the size of the persistent volume that
107113
Porter will request when running the Porter Agent. It is used to

config/crd/bases/getporter.org_credentialsets.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.12.0
6+
controller-gen.kubebuilder.io/version: v0.12.1
77
name: credentialsets.getporter.org
88
spec:
99
group: getporter.org

config/crd/bases/getporter.org_installationoutputs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.12.0
6+
controller-gen.kubebuilder.io/version: v0.12.1
77
name: installationoutputs.getporter.org
88
spec:
99
group: getporter.org

config/crd/bases/getporter.org_installations.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.12.0
6+
controller-gen.kubebuilder.io/version: v0.12.1
77
name: installations.getporter.org
88
spec:
99
group: getporter.org

config/crd/bases/getporter.org_parametersets.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.12.0
6+
controller-gen.kubebuilder.io/version: v0.12.1
77
name: parametersets.getporter.org
88
spec:
99
group: getporter.org

config/crd/bases/getporter.org_porterconfigs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.12.0
6+
controller-gen.kubebuilder.io/version: v0.12.1
77
name: porterconfigs.getporter.org
88
spec:
99
group: getporter.org

docs/content/_index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ The operator is still under development, but it is ready for you to try out and
2626
* [QuickStart: Using the Porter Operator](/operator/quickstart/)
2727
* [Porter Operator File Formats](/operator/file-formats/)
2828
* [Configure the Porter Agent]
29-
[porter installation apply]: /cli/porter_installations_apply/
30-
[Desired State QuickStart]: /quickstart/desired-state/
29+
[porter installation apply]: https://porter.sh/cli/porter_installations_apply/
30+
[Desired State QuickStart]: https://porter.sh/docs/introduction/concepts-and-components/intro-desired-state/

docs/content/quickstart/_index.md

+44-5
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,22 @@ In this QuickStart you will learn how to install and use the [Porter Operator] o
1717

1818
## Install the Operator
1919

20+
🚨 If you are using [KinD] or [Minikube] please make sure to visit the integration pages before starting. 🚨
21+
2022
The Porter Operator is installed using Porter, and requires an existing Kubernetes cluster.
2123
First, generate a credential set that points to the location of your kubeconfig file, for example using the path $HOME/.kube/config.
2224

23-
The commands below use the v0.7.1 release, but there may be a more recent release of the Operator.
25+
The commands below use the v1.0.0 release, but there may be a more recent release of the Operator.
2426
Check our [releases page](https://github.com/getporter/operator/releases) and use the most recent version number.
2527

2628
```
27-
porter credentials generate porterops -r ghcr.io/getporter/porter-operator:v0.8.0
29+
porter credentials generate porterops -r ghcr.io/getporter/porter-operator:v1.0.0
2830
```
2931

3032
Now that Porter knows which cluster to target, install the Operator with the following command:
3133

3234
```
33-
porter install porterops -c porterops -r ghcr.io/getporter/porter-operator:v0.8.0
35+
porter install porterops -c porterops -r ghcr.io/getporter/porter-operator:v1.0.0
3436
```
3537

3638
Before you use the operator, you need to configure a Kubernetes namespace with the necessary configuration.
@@ -336,13 +338,50 @@ The operator will use `porter plugins install` to install defined plugins. Any b
336338

337339
If no plugins are required, this field is optional.
338340

341+
## Upgrade Operator Manager Image
342+
The Operator Manager Image will be built the the most recent version to run. However if you'd like to change the repository or SHA of the image here's how it can be done.
343+
344+
In the `porter.yaml` we specify the following parameters:
345+
346+
```yaml
347+
- name: operator-repository
348+
description: Porter Operator Manager Image Repository
349+
type: string
350+
default: ""
351+
- name: operator-digest
352+
description: Porter Operator Manager Image Digest (defaults to a stable version)
353+
type: string
354+
default: ""
355+
```
356+
357+
When upgrading, these could be passed in by using a paramter set or by CLI flags:
358+
359+
```
360+
porter upgrade porterops -c porterops --param operator-repository=localhost:5000
361+
```
362+
363+
## Injecting Kube Config via Parameters
364+
If you do not want to set the kube config credential by creating a credential set, then
365+
there is a way to inject the kube config into the bundle by utilizing parameters.
366+
367+
🚨 This is a workaround and we will be working on building this out as a feature shortly
368+
369+
By using a base64 encoded string containing the kube config it can be passed as a parameter:
370+
371+
```yaml
372+
parameters:
373+
namespace: mysql
374+
mysql-name: carolyn-mysql
375+
kubeconfig: YXBpVmVyc2lvbjogdjEKY2x1c.... # generated with cat kube.config > base64 -w 0
376+
```
377+
339378
## Next Steps
340379

341380
You now know how to install and configure the Porter Operator. The project is still incomplete, so watch this repository for updates!
342381

343382
* [Porter Operator Custom Resources](/operator/file-formats/)
344383

345384
[install-porter]: https://github.com/getporter/porter/releases?q=v1.0.0&expanded=true
346-
[KinD]: /best-practices/kind/
347-
[Minikube]: /best-practices/minikube/
385+
[KinD]: https://porter.sh/docs/integrations/kind/
386+
[Minikube]: https://porter.sh/docs/integrations/minikube/
348387
[getporter/hello-llama]: https://hub.docker.com/r/getporter/hello-llama

installer/vanilla.porter.yaml

+10-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ registry: ghcr.io/getporter
66
dockerfile: Dockerfile.tmpl
77

88
parameters:
9+
- name: operator_repository
10+
description: Porter Operator Manager Image Repository
11+
type: string
12+
default: ""
13+
- name: operator_digest
14+
description: Porter Operator Manager Image Digest (defaults to a stable version)
15+
type: string
16+
default: ""
917
- name: namespace
1018
description: Setup Porter in this namespace
1119
type: string
@@ -172,5 +180,5 @@ images:
172180
manager:
173181
description: "The porter operator manager"
174182
imageType: "docker"
175-
repository: "PLACEHOLDER"
176-
digest: "PLACEHOLDER"
183+
repository: ${ bundle.parameters.operator_repository }
184+
digest: ${ bundle.parameters.operator_digest }

0 commit comments

Comments
 (0)