Skip to content

Commit 3c83e41

Browse files
authored
Merge pull request #116 from VinozzZ/update-porter-to-rc.1
update porter to v1.0.0-rc.1
2 parents 8419997 + 832e16d commit 3c83e41

File tree

9 files changed

+43
-41
lines changed

9 files changed

+43
-41
lines changed

api/v1/const.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const (
1010
//
1111
// As we test out the operator with new versions of Porter, keep this value
1212
// up-to-date so that the default version is guaranteed to work.
13-
DefaultPorterAgentVersion = "v1.0.0-beta.1"
13+
DefaultPorterAgentVersion = "v1.0.0-rc.1"
1414

1515
// LabelJobType is a label applied to jobs created by the operator. It
1616
// indicates the purpose of the job.

config/crd/bases/porter.sh_porterconfigs.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ spec:
102102
type: object
103103
type: array
104104
verbosity:
105+
description: 'Threshold for printing messages to the console Allowed
106+
values are: debug, info, warn, error'
105107
type: string
106108
type: object
107109
type: object

docs/content/file-formats.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ metadata:
148148
name: customAgent
149149
spec:
150150
porterRepository: ghcr.io/getporter/porter-agent
151-
porterVersion: v1.0.0-beta.1
151+
porterVersion: v1.0.0-rc.1
152152
serviceAccount: porter-agent
153153
volumeSize: 64Mi
154154
pullPolicy: Always

docs/content/install.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ title: Install the Porter Operator
33
description: Get up and running with the Porter Operator
44
---
55

6-
If you aren't already familiar with Porter, we recommend that you install and use [Porter v1.0.0-beta.1][install-porter] first and then once you are comfortable, learn how to automate Porter with the operator.
6+
If you aren't already familiar with Porter, we recommend that you install and use [Porter v1.0.0-rc.1][install-porter] first and then once you are comfortable, learn how to automate Porter with the operator.
77

8-
The commands below use the v0.6.0 release, but there may be a more recent release of the Operator.
8+
The commands below use the v0.7.0 release, but there may be a more recent release of the Operator.
99
Check our [releases page](https://github.com/getporter/operator/releases) and use the most recent version number.
1010

1111
The Porter Operator is installed with ... Porter!
1212
First, use explain to see what credentials and parameters you can use when installing and configuring the operator.
1313

1414
```
15-
$ porter explain -r ghcr.io/getporter/porter-operator:v0.6.0
15+
$ porter explain -r ghcr.io/getporter/porter-operator:v0.7.0
1616
Name: porter-operator
1717
Description: The Porter Operator for Kubernetes. Execute bundles on a Kubernetes cluster.
18-
Version: 0.6.0
19-
Porter Version: v1.0.0-beta.1
18+
Version: 0.7.0
19+
Porter Version: v1.0.0-rc.1
2020
2121
Credentials:
2222
---------------------------------------------------------------------
@@ -86,17 +86,17 @@ This bundle uses the following tools: exec, helm3, kubernetes.
8686
8787
To install this bundle run the following command, passing --param KEY=VALUE for any parameters you want to customize:
8888
porter credentials generate mycreds --reference ghcr.io/getporter/porter-operator:v0.5.0
89-
porter install --reference ghcr.io/getporter/porter-operator:v0.6.0 --cred mycreds
89+
porter install --reference ghcr.io/getporter/porter-operator:v0.7.0 -c mycreds
9090
```
9191

9292
Generate a credential set for the bundle, the only required credential for the operator is a kubeconfig for the cluster that the operator is to be installed in.
9393
```
94-
porter credentials generate porterops -r ghcr.io/getporter/porter-operator:v0.6.0
94+
porter credentials generate porterops -r ghcr.io/getporter/porter-operator:v0.7.0
9595
```
9696

9797
Install the operator into the porter-operator-system namespace:
9898
```
99-
porter install porterops -c porterops -r ghcr.io/getporter/porter-operator:v0.6.0
99+
porter install porterops -c porterops -r ghcr.io/getporter/porter-operator:v0.7.0
100100
```
101101

102102
Create a namespace with the appropriate RBAC and configuration. This namespace is where you will create installation CRDs and the operator will create corresponding Jobs to execute the porter CLI.

docs/content/quickstart/_index.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ In this QuickStart you will learn how to install and use the [Porter Operator] o
2020
The Porter Operator is installed using Porter, and requires an existing Kubernetes cluster.
2121
First, generate a credential set that points to the location of your kubeconfig file, for example using the path $HOME/.kube/config.
2222

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

2626
```
27-
porter credentials generate porterops -r ghcr.io/getporter/porter-operator:v0.6.0
27+
porter credentials generate porterops -r ghcr.io/getporter/porter-operator:v0.7.0
2828
```
2929

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

3232
```
33-
porter install porterops -c porterops -r ghcr.io/getporter/porter-operator:v0.6.0
33+
porter install porterops -c porterops -r ghcr.io/getporter/porter-operator:v0.7.0
3434
```
3535

3636
Before you use the operator, you need to configure a Kubernetes namespace with the necessary configuration.

go.mod

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ replace (
1818
)
1919

2020
require (
21-
get.porter.sh/magefiles v0.3.0
22-
get.porter.sh/porter v1.0.0-beta.1
23-
github.com/carolynvs/magex v0.8.1
21+
get.porter.sh/magefiles v0.3.2
22+
get.porter.sh/porter v1.0.0-rc.1
23+
github.com/carolynvs/magex v0.9.0
2424
github.com/go-logr/logr v1.2.3
2525
github.com/magefile/mage v1.13.0
2626
github.com/mitchellh/mapstructure v1.4.2
@@ -59,8 +59,8 @@ require (
5959
github.com/cbroglie/mustache v1.0.1 // indirect
6060
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
6161
github.com/cespare/xxhash/v2 v2.1.2 // indirect
62-
github.com/cnabio/cnab-go v0.23.4 // indirect
63-
github.com/cnabio/cnab-to-oci v0.3.4 // indirect
62+
github.com/cnabio/cnab-go v0.24.0 // indirect
63+
github.com/cnabio/cnab-to-oci v0.3.7 // indirect
6464
github.com/containerd/containerd v1.6.6 // indirect
6565
github.com/containerd/stargz-snapshotter/estargz v0.11.2 // indirect
6666
github.com/cyberphone/json-canonicalization v0.0.0-20220216171627-b6721b06b4ef // indirect
@@ -175,7 +175,7 @@ require (
175175
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
176176
golang.org/x/net v0.0.0-20220708220712-1185a9018129 // indirect
177177
golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0 // indirect
178-
golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d // indirect
178+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
179179
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
180180
golang.org/x/text v0.3.7 // indirect
181181
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect

go.sum

+15-11
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,11 @@ contrib.go.opencensus.io/exporter/stackdriver v0.12.1/go.mod h1:iwB6wGarfphGGe/e
7474
contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE=
7575
contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA=
7676
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
77-
get.porter.sh/magefiles v0.3.0 h1:uwCOTblBx2RFN2IEgIUDP4sNj/C4F26KqAdqSREJL7g=
7877
get.porter.sh/magefiles v0.3.0/go.mod h1:lwDECEEivbBHACLImnDEhwlr8g3E4xZR1W0DO8FOGa8=
79-
get.porter.sh/porter v1.0.0-beta.1 h1:QYHPcW/HmqkhIMlWTD+siNuao7kdFfzc1a6CpFK1s+M=
80-
get.porter.sh/porter v1.0.0-beta.1/go.mod h1:l0h5o4keIWlbufkybvn9d35tYVsIM0/xwSsMeS3h32s=
78+
get.porter.sh/magefiles v0.3.2 h1:RDJini5LBQ8pYnc0r8M6cX2Pk+CPsCtyFwO3fy8Jb5g=
79+
get.porter.sh/magefiles v0.3.2/go.mod h1:w8ikniAFHO7AVvWayyWF7ViHoh4tNKwTxtKpO1FyGkU=
80+
get.porter.sh/porter v1.0.0-rc.1 h1:8sYXXW2dwp5V5Llk19f4o/KAkj7xwZo1HNRl49m0r4w=
81+
get.porter.sh/porter v1.0.0-rc.1/go.mod h1:ZDh+OB2lJJL5aA7zBLhWRE9m9DhRxH0iVW88OoifL0c=
8182
git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
8283
git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
8384
github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg=
@@ -306,8 +307,8 @@ github.com/carolynvs/aferox v0.3.0/go.mod h1:eb7CHGIO33CCZS//xtnblvPZbuuZMv0p1Vb
306307
github.com/carolynvs/datetime-printer v0.2.0 h1:Td3FU4YGzx0OogCMhCmLBTUTDPQcq0xlgCeMhAKZmMc=
307308
github.com/carolynvs/datetime-printer v0.2.0/go.mod h1:p9W8ZUhmQUOVD5kiDuGXwRG65/nTkZWlLylY7s+Qw2k=
308309
github.com/carolynvs/magex v0.8.0/go.mod h1:vZB3BkRfkd5ZMtkxJkCGbdFyWGoZiuNPKhx6uEQARmY=
309-
github.com/carolynvs/magex v0.8.1 h1:7QYsqIANzYbj9fgE3fJWOJf+DfkD0Ymr8kz0kNhXxFM=
310-
github.com/carolynvs/magex v0.8.1/go.mod h1:aBJBqUIBFyatSGOv0Ak6j8U+9PzotM600G6Dz0Df1Wg=
310+
github.com/carolynvs/magex v0.9.0 h1:fWe7oshGv6zuei5Z6EI95RSlOKjIifBZ26myB9G+m/I=
311+
github.com/carolynvs/magex v0.9.0/go.mod h1:H1LW6RYJ/sNbisMmPe9E73aJZa8geKLKK9mBWLWz3ek=
311312
github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
312313
github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod h1:oDpT4efm8tSYHXV5tHSdRvBet/b/QzxZ+XyyPehvm3A=
313314
github.com/cbroglie/mustache v1.0.1 h1:ivMg8MguXq/rrz2eu3tw6g3b16+PQhoTn6EZAhst2mw=
@@ -347,10 +348,14 @@ github.com/cloudflare/cfssl v0.0.0-20181213083726-b94e044bb51e/go.mod h1:yMWuSON
347348
github.com/cloudflare/cfssl v1.4.1/go.mod h1:KManx/OJPb5QY+y0+o/898AMcM128sF0bURvoVUSjTo=
348349
github.com/cloudflare/go-metrics v0.0.0-20151117154305-6a9aea36fb41/go.mod h1:eaZPlJWD+G9wseg1BuRXlHnjntPMrywMsyxf+LTOdP4=
349350
github.com/cloudflare/redoctober v0.0.0-20171127175943-746a508df14c/go.mod h1:6Se34jNoqrd8bTxrmJB2Bg2aoZ2CdSXonils9NsiNgo=
350-
github.com/cnabio/cnab-go v0.23.4 h1:jplQcSnvFyQlD6swiqL3BmqRnhbnS+lc/EKdBLH9E80=
351351
github.com/cnabio/cnab-go v0.23.4/go.mod h1:9EmgHR51LFqQStzaC+xHPJlkD4OPsF6Ev5Y8e/YHEns=
352-
github.com/cnabio/cnab-to-oci v0.3.4 h1:u1AUUplhKojCMgee17QkjU27yM1tfH9fOTFvxkrEqVw=
353-
github.com/cnabio/cnab-to-oci v0.3.4/go.mod h1:7f86Z39HUg67wg8dZvxvFpW2pGDjK3RwbJAMJGxTXHQ=
352+
github.com/cnabio/cnab-go v0.24.0 h1:l5dSAEUsGoccIGRgDmH4HncHfw1a2zaiEft/RG6LS8Y=
353+
github.com/cnabio/cnab-go v0.24.0/go.mod h1:Zm0HTH8xxzinB64SXm7KFSna7DEN0ZjZwrRwZpfgChU=
354+
github.com/cnabio/cnab-to-oci v0.3.7 h1:wA2AG3HQMaJZhWlr3zsfVoa2m5B1R/SP+YcoFuNfP9o=
355+
github.com/cnabio/cnab-to-oci v0.3.7/go.mod h1:AvVNl0Hh3VBk1zqeLdyE5S3bTQ5EsZPPF4mUUJYyy1Y=
356+
github.com/cnabio/image-relocation v0.0.0-20220815190842-cd2f11ecad88/go.mod h1:E1bwI4v9AFrspAWqje0clEo31bHHH/YPxk1a4L5O3ZE=
357+
github.com/cnabio/image-relocation v0.9.0 h1:sBSchA1sRBesje0uJrPSz1lLtsIjRMxiuIJ20aYpnpI=
358+
github.com/cnabio/image-relocation v0.9.0/go.mod h1:E1bwI4v9AFrspAWqje0clEo31bHHH/YPxk1a4L5O3ZE=
354359
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
355360
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
356361
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
@@ -1415,7 +1420,6 @@ github.com/pierrec/lz4/v4 v4.0.3/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuR
14151420
github.com/pierrec/lz4/v4 v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
14161421
github.com/pierrec/lz4/v4 v4.1.14 h1:+fL8AQEZtz/ijeNnpduH0bROTu0O3NZAlPjQxGn8LwE=
14171422
github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
1418-
github.com/pivotal/image-relocation v0.0.0-20191111101224-e94aff6df06c h1:aWFqZbzCsh4JXjW59u+taslG9zzxF5PEyINyMv33rlg=
14191423
github.com/pivotal/image-relocation v0.0.0-20191111101224-e94aff6df06c/go.mod h1:/JNbQwGylYm3AQh8q+MBF8e/h0W1Jy20JGTvozuXYTE=
14201424
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
14211425
github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -2162,8 +2166,8 @@ golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBc
21622166
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21632167
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21642168
golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2165-
golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d h1:/m5NbqQelATgoSPVC2Z23sR4kVNokFwDDyWh/3rGY+I=
2166-
golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2169+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU=
2170+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21672171
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
21682172
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
21692173
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

installer-olm/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ porter credentials generate mycluster --reference ghcr.io/getporter/olm:v0.1.0
1515

1616
## Install the latest version of OLM
1717
```
18-
porter install olm --reference ghcr.io/getporter/olm:v0.1.0 --cred mycluster
18+
porter install olm --reference ghcr.io/getporter/olm:v0.1.0 -c mycluster
1919
```
2020

2121
## Install a specific version of OLM
2222
```
23-
porter install olm --reference ghcr.io/getporter/olm:v0.1.0 --cred mycluster --param version=v0.16.0
23+
porter install olm --reference ghcr.io/getporter/olm:v0.1.0 -c mycluster --param version=v0.16.0
2424
```
2525

2626
[olm]: https://github.com/operator-framework/operator-lifecycle-manager

magefiles/magefile.go

+5-9
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ const (
5454
registryContainer = "registry"
5555

5656
// Porter home for running commands
57-
porterVersion = "v1.0.0-beta.1"
57+
porterVersion = "v1.0.0-rc.1"
5858
)
5959

6060
var srcDirs = []string{"api", "config", "controllers", "installer", "installer-olm"}
6161
var binDir = "bin"
6262

6363
// Porter agent that has k8s plugin included
6464
var porterAgentImgRepository = "ghcr.io/getporter/dev/porter-agent-kubernetes"
65-
var porterAgentImgVersion = "v1.0.0-beta.1"
65+
var porterAgentImgVersion = "v1.0.0-rc.1"
6666

6767
// Local porter agent image name to use for local testing
6868
var localAgentImgName = "localhost:5000/porter-agent:canary-dev"
@@ -124,11 +124,7 @@ func BuildBundle() {
124124

125125
meta := releases.LoadMetadata()
126126
version := strings.TrimPrefix(meta.Version, "v")
127-
verbose := ""
128-
if mg.Verbose() {
129-
verbose = "--verbose"
130-
}
131-
buildPorterCmd("build", "--version", version, "-f=porter.yaml", verbose).
127+
buildPorterCmd("build", "--version", version, "-f=porter.yaml").
132128
CollapseArgs().Env("PORTER_EXPERIMENTAL=build-drivers", "PORTER_BUILD_DRIVER=buildkit").
133129
In("installer").Must().RunV()
134130
}
@@ -161,7 +157,7 @@ func getPlugins() error {
161157
feed string
162158
version string
163159
}{
164-
{name: "kubernetes", feed: "https://cdn.porter.sh/plugins/atom.xml", version: "latest"},
160+
{name: "kubernetes", feed: "https://cdn.porter.sh/plugins/atom.xml", version: "v1.0.0-rc.1"},
165161
}
166162
var errG errgroup.Group
167163
for _, plugin := range plugins {
@@ -668,7 +664,7 @@ func BuildLocalPorterAgent() {
668664
mgx.Must(err)
669665
}
670666

671-
//generatedCodeFilter remove generated code files from coverage report
667+
// generatedCodeFilter remove generated code files from coverage report
672668
func generatedCodeFilter(filename string) error {
673669
fd, err := ioutil.ReadFile(filename)
674670
if err != nil {

0 commit comments

Comments
 (0)