Skip to content

Commit

Permalink
Bump porter to v1.0.0-beta.1 (#107)
Browse files Browse the repository at this point in the history
* Bump porter to v1.0.0-beta.1

Signed-off-by: Carolyn Van Slyck <[email protected]>

* Bump deps for CVE-2022-1996

Signed-off-by: Carolyn Van Slyck <[email protected]>

* go mod tidy again for reasons

Signed-off-by: Carolyn Van Slyck <[email protected]>
  • Loading branch information
carolynvs authored Jul 11, 2022
1 parent 0a8db7f commit 2c5dc0f
Show file tree
Hide file tree
Showing 20 changed files with 899 additions and 562 deletions.
2 changes: 1 addition & 1 deletion api/v1/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const (
//
// As we test out the operator with new versions of Porter, keep this value
// up-to-date so that the default version is guaranteed to work.
DefaultPorterAgentVersion = "v1.0.0-alpha.18"
DefaultPorterAgentVersion = "v1.0.0-beta.1"

// LabelJobType is a label applied to jobs created by the operator. It
// indicates the purpose of the job.
Expand Down
3 changes: 2 additions & 1 deletion api/v1/credentialset_types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package v1
import (
"testing"

"get.porter.sh/porter/pkg/storage"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

Expand Down Expand Up @@ -30,7 +31,7 @@ func TestCredentialSetSpec_ToPorterDocument(t *testing.T) {
}{
{
name: "golden file test",
fields: fields{SchemaVersion: "1.0.1",
fields: fields{SchemaVersion: string(storage.CredentialSetSchemaVersion),
Name: "porter-test-me",
Namespace: "dev",
Credentials: []Credential{{
Expand Down
3 changes: 2 additions & 1 deletion api/v1/installation_types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package v1
import (
"testing"

"get.porter.sh/porter/pkg/storage"
"get.porter.sh/porter/pkg/test"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand All @@ -15,7 +16,7 @@ func TestInstallationSpec_ToPorterDocument(t *testing.T) {
// Validate the special handling for the arbitrary parameters
// which the CRD can't directly represent as map[string]interface{}
spec := InstallationSpec{
SchemaVersion: "1.0.0",
SchemaVersion: string(storage.InstallationSchemaVersion),
Name: "mybuns",
Namespace: "dev",
Bundle: OCIReferenceParts{
Expand Down
3 changes: 2 additions & 1 deletion api/v1/parameterset_types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package v1
import (
"testing"

"get.porter.sh/porter/pkg/storage"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

Expand Down Expand Up @@ -30,7 +31,7 @@ func TestParameterSetSpec_ToPorterDocument(t *testing.T) {
}{
{
name: "golden file test",
fields: fields{SchemaVersion: "1.0.1",
fields: fields{SchemaVersion: string(storage.ParameterSetSchemaVersion),
Name: "porter-test-me",
Namespace: "dev",
Parameters: []Parameter{
Expand Down
2 changes: 1 addition & 1 deletion api/v1/testdata/installation.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schemaVersion: 1.0.0
schemaVersion: 1.0.2
name: mybuns
namespace: dev
bundle:
Expand Down
791 changes: 406 additions & 385 deletions config/crd/bases/porter.sh_agentactions.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion config/samples/exec-outputs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
labels:
porter.sh/testdata: "true"
spec:
schemaVersion: 1.0.0
schemaVersion: 1.0.2
namespace: operator
name: outputs
bundle:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/hello-llama.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
labels:
porter.sh/testdata: "true"
spec:
schemaVersion: 1.0.0
schemaVersion: 1.0.2
namespace: operator
name: mellama
bundle:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/kubeflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
labels:
porter.sh/testdata: "true"
spec:
schemaVersion: 1.0.0
schemaVersion: 1.0.2
namespace: operator
name: kubeflow
bundle:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/porter-hello.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
labels:
porter.sh/testdata: "true"
spec:
schemaVersion: 1.0.0
schemaVersion: 1.0.2
namespace: operator
name: hello
bundle:
Expand Down
2 changes: 1 addition & 1 deletion docs/content/file-formats.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ metadata:
name: customAgent
spec:
porterRepository: ghcr.io/getporter/porter-agent
porterVersion: v1.0.0-alpha.18
porterVersion: v1.0.0-beta.1
serviceAccount: porter-agent
volumeSize: 64Mi
pullPolicy: Always
Expand Down
16 changes: 8 additions & 8 deletions docs/content/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ title: Install the Porter Operator
description: Get up and running with the Porter Operator
---

If you aren't already familiar with Porter, we recommend that you install and use [Porter v1.0.0-alpha.18][install-porter] first and then once you are comfortable, learn how to automate Porter with the operator.
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.

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

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

```
$ porter explain -r ghcr.io/getporter/porter-operator:v0.5.2
$ porter explain -r ghcr.io/getporter/porter-operator:v0.6.0
Name: porter-operator
Description: The Porter Operator for Kubernetes. Execute bundles on a Kubernetes cluster.
Version: 0.5.2
Porter Version: v1.0.0-alpha.18
Version: 0.6.0
Porter Version: v1.0.0-beta.1
Credentials:
---------------------------------------------------------------------
Expand Down Expand Up @@ -86,17 +86,17 @@ This bundle uses the following tools: exec, helm3, kubernetes.
To install this bundle run the following command, passing --param KEY=VALUE for any parameters you want to customize:
porter credentials generate mycreds --reference ghcr.io/getporter/porter-operator:v0.5.0
porter install --reference ghcr.io/getporter/porter-operator:v0.5.2 --cred mycreds
porter install --reference ghcr.io/getporter/porter-operator:v0.6.0 --cred mycreds
```

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.
```
porter credentials generate porterops -r ghcr.io/getporter/porter-operator:v0.5.2
porter credentials generate porterops -r ghcr.io/getporter/porter-operator:v0.6.0
```

Install the operator into the porter-operator-system namespace:
```
porter install porterops -c porterops -r ghcr.io/getporter/porter-operator:v0.5.2
porter install porterops -c porterops -r ghcr.io/getporter/porter-operator:v0.6.0
```

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.
Expand Down
12 changes: 6 additions & 6 deletions docs/content/quickstart/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ In this QuickStart you will learn how to install and use the [Porter Operator] o
The Porter Operator is installed using Porter, and requires an existing Kubernetes cluster.
First, generate a credential set that points to the location of your kubeconfig file, for example using the path $HOME/.kube/config.

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

```
porter credentials generate porterops -r ghcr.io/getporter/porter-operator:v0.5.2
porter credentials generate porterops -r ghcr.io/getporter/porter-operator:v0.6.0
```

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

```
porter install porterops -c porterops -r ghcr.io/getporter/porter-operator:v0.5.2
porter install porterops -c porterops -r ghcr.io/getporter/porter-operator:v0.6.0
```

Before you use the operator, you need to configure a Kubernetes namespace with the necessary configuration.
Expand Down Expand Up @@ -95,7 +95,7 @@ Let's create an installation resource that specifies that we want to have the ge
name: hello-llama
namespace: quickstart
spec:
schemaVersion: 1.0.0
schemaVersion: 1.0.2
namespace: quickstart
name: mellama
bundle:
Expand Down Expand Up @@ -146,7 +146,7 @@ Now that our bundle is installed, let's make some changes to trigger an upgrade.
name: hello-llama
namespace: quickstart
spec:
schemaVersion: 1.0.0
schemaVersion: 1.0.2
namespace: quickstart
name: mellama
bundle:
Expand Down Expand Up @@ -231,7 +231,7 @@ Let's walk through the second method in detail.
namespace: quickstart
spec:
uninstalled: true
schemaVersion: 1.0.0
schemaVersion: 1.0.2
namespace: quickstart
name: mellama
# Contents truncated because they aren't relevant to uninstall
Expand Down
2 changes: 1 addition & 1 deletion docs/content/quickstart/llama.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: hello-llama
namespace: quickstart
spec:
schemaVersion: 1.0.0
schemaVersion: 1.0.2
namespace: quickstart
name: mellama
bundle:
Expand Down
Loading

0 comments on commit 2c5dc0f

Please sign in to comment.