Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync from main #2101

Merged
merged 28 commits into from
May 26, 2022
Merged

Sync from main #2101

merged 28 commits into from
May 26, 2022

Conversation

carolynvs
Copy link
Member

This merges all recent relevant changes from main back into the release/v1 branch. I didn't do a cherry-pick because it's harder to track what has been synced between the branches but in this case it was a bit messy. I've crossed out the commits that were considered for the merge but backed out because they are not relevant anymore to v1.

This brings in the following pull requests that target main:
d548847 Merge pull request #2098 from hrittikhere/main
6a11797 Edit index.md for Typo (#2094)
14662ec Merge pull request #2087 from carolynvs/open-issues-only
05ab24c Merge pull request #2086 from carolynvs/find-issues
6f59a6b Merge pull request #2076 from carolynvs/pin-installed-versions
7db0ea7 Merge pull request #2049 from carolynvs/revert-symlink
678aaf6 Merge pull request #2046 from carolynvs/backport-stringarray-fix
5157a01 Switch from StringSlice to StringArray (#1931)
59d55d3 Merge pull request #2032 from tamirkamara/fix/linux-install-symlink
0038f3c Merge pull request #2024 from qpetraroia/qpetraroia
a059a96 Merge pull request #2011 from carolynvs/probot-settings
dc24a06 Merge pull request #1896 from aguywithcode/patch-1
55d92c0 Bump cnab-go, Go, docker, containerd and k8s (on stable) (#1971)
7bf21dd Merge pull request #1970 from carolynvs/f5-adopter

carolynvs and others added 28 commits March 14, 2022 10:22
This adds F5 to Porter's adopters list! 🎉

Thank you @bdegeeter and @steven-gettys for all your work making this
happen.

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>
)

* Bump cnab-go, cnab-to-oci, Go, docker, containerd and k8s

Update to the most recently patched versions of cnab-go (stable fork),
cnab-to-oci,  Go, docker, containerd, and k8s. The majority of these versions are actually resolved from
cnab-go, so we don't need to maintain replace statements for them
anymore! 🎉

I'm staying on Go 1.16 for the go.mod format because go mod tidy can't
resolve the graph when it's set to go 1.17. On release/v1 we are happily
using the latest go.mod format so I'm not concerned that it's a long
term problem. We still build with Go 1.17, it's just the file format
that is impacted.

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>

* Bump to cnab-to-oci 0.3.3

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>
This defines some of our repository configuration in code so that its easier to manage our repositories and keep them consistent. It defines our labels and repository permissions.

The probot settings app updates the repository to apply the settings
in this file when code is pushed to the main branch.

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>
Signed-off-by: Michael Brown <micbrown@microsoft.com>
Added reference parameter to the install command
Add probot settings configuration file
Signed-off-by: Quentin Petraroia <q.petraroia@gmail.com>
Signed-off-by: Quentin Petraroia <q.petraroia@gmail.com>
Signed-off-by: Tamir Kamara <26870601+tamirkamara@users.noreply.github.com>
Signed-off-by: Tamir Kamara <26870601+tamirkamara@users.noreply.github.com>
…symlink

Linux install script uses a symlink
* test for parameters with space

Signed-off-by: Simpcyclassy <chioma.onyekpere@gmail.com>

* add contributor

Signed-off-by: Simpcyclassy <chioma.onyekpere@gmail.com>

* handle bundle parameter escape

Signed-off-by: Simpcyclassy <chioma.onyekpere@gmail.com>

* update parameters documentation

Signed-off-by: Simpcyclassy <chioma.onyekpere@gmail.com>

* Merge branch 'release/v1' into parameter-space-error

Signed-off-by: Simpcyclassy <chioma.onyekpere@gmail.com>

* array to slice paramenter

Signed-off-by: Simpcyclassy <chioma.onyekpere@gmail.com>

* define params as array var

Signed-off-by: Simpcyclassy <chioma.onyekpere@gmail.com>

* add schema version to yaml file

Signed-off-by: Simpcyclassy <chioma.onyekpere@gmail.com>

* Help get PR merged

* Run mage build to generate the cli command documentation to include
  the recent changes
* Skip the failing test that was added. This PR has enough to fix the
  comma parsing, and a follow-up will fix this failing test for when a
parameter has a space in it.

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>

* Fix merge conflicts with release/v1

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>

Co-authored-by: Carolyn Van Slyck <me@carolynvanslyck.com>

Signed-off-by: Chioma Onyekpere <chioma.onyekpere@gmail.com>
Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>
…-fix

Backport Switch from StringSlice to StringArray (getporter#1931)
This reverts commit 9a19346.

Closes getporter#2048

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>
Revert "Use a symlink in a linux install"
Specify versions of each mixin and plugin to install so that it's
compatible with porter v0.38. I'm still using the same tag for both
porter and exec since they move in lockstep.

Before we cut a v1.0.0 release of porter we need to update this script
to replace latest with the last stable version of v0.38

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>
Pin v0.38 install script to compatible package versions
https://getporter.org/find-issue redirects to a search of the getporter
org for any issues labeled with "help wanted" or "good first issue"

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>
Add shortlink to find an issue to work on
I missed that the search page was also showing closed issues. This fixes
that so only open unassigned issues are displayed.

Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>
Find Issues link should only show open issues
* Fix Typo for _index.md

Signed-off-by: Hrittik Roy <67012359+hrittikhere@users.noreply.github.com>

* Add Hrittik Roy as contributor

Signed-off-by: Hrittik Roy <67012359+hrittikhere@users.noreply.github.com>

* Update Link for styling consistency

Signed-off-by: Hrittik Roy <67012359+hrittikhere@users.noreply.github.com>
Signed-off-by: Hrittik Roy <67012359+hrittikhere@users.noreply.github.com>
Signed-off-by: Carolyn Van Slyck <me@carolynvanslyck.com>
@carolynvs carolynvs marked this pull request as ready for review May 26, 2022 15:07
@carolynvs carolynvs merged commit b189c85 into getporter:release/v1 May 26, 2022
@carolynvs carolynvs deleted the sync-from-main branch May 26, 2022 18:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants