Rebase master with 0.10.0 and 0.9.1 releases #1403
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jgwest
requested changes
Jun 5, 2024
|
@jgwest yes, I agree :') I was rebasing the master branch with the changes in the release-0.10 branch. After I released 0.10.0 I didn't update the master branch right away (slipped my mind with vacation and the amount of time it took to get the olm catalog PR's merged- my bad) but it seems like there were a lotttt of other changes also not synced to master branch from release-0.10 branch? I've already taken a look at the 0.10.0 changes that I made and I think there's okay, but I've requested Anand and Abhishek's reviews to make sure everything else looks right before we consider merging it. If you also wouldn't mind taking a look, the more eyes on it the better! |
|
@reginapizza Strangely, the 'Files Changed' tab of this PR seems to be reporting changes to |
reginapizza
force-pushed
the
rebase-master-0.10.0
branch
from
48bca8c to
ebc1aef
Compare
|
Okay I re-synced from master again (I can see I pulled from it originally, so I'm not really sure why it did all those commits over again) and now I think it looks much better! Thanks for the tip @jgwest |
reginapizza
changed the title
reginapizza
force-pushed
the
rebase-master-0.10.0
branch
from
907f49f to
90a88d7
Compare
|
fyi- just updated this to also included the OLM manifests for the 0.9.1 release as well since those were also missing from master |
|
Generated Code step is failing as there is diff reported in |
|
@jgwest can you please re-review and remove requested changes if it looks okay now? There's currently a block on merging with it. Thank you! |
anandf
pushed a commit
to anandf/argocd-operator
that referenced
this pull request
Jun 6, 2024
* argocd-operator v0.10.0 release (argoproj-labs#1343) * fix typo in metadata (argoproj-labs#1354) * update replaces version number for 0.10.0 to 0.9.1 (argoproj-labs#1365) * update make deploy manifests * rebase with 0.9.1 * fix bundle manifest control plane * make bundle Signed-off-by: Anand Francis Joseph <[email protected]>
anandf
added a commit
that referenced
this pull request
Jun 7, 2024
* fix: don't change the default policy to reencrypt if the TLS secret is present (#1401) Signed-off-by: Chetan Banavikalmutt <[email protected]> Signed-off-by: Anand Francis Joseph <[email protected]> * Add SeccompProfile for PodSecurityStandards "restricted" to avoid Pod Security Violations on restricted namespaces (#1288) * Add SeccompProfile for PSA restricted It is necessary to set the seccompProfile to RuntimeDefault to meet the PodSecurityStandards of restricted, which will be a common default in clusters. Otherwise the workloads will be evaluated as baseline and rejected, if not set otherwise in the namespace metadata. * fix: failing test Signed-off-by: iam-veeramalla <[email protected]> --------- Signed-off-by: iam-veeramalla <[email protected]> Co-authored-by: iam-veeramalla <[email protected]> Signed-off-by: Anand Francis Joseph <[email protected]> * Rebase master with 0.10.0 and 0.9.1 releases (#1403) * argocd-operator v0.10.0 release (#1343) * fix typo in metadata (#1354) * update replaces version number for 0.10.0 to 0.9.1 (#1365) * update make deploy manifests * rebase with 0.9.1 * fix bundle manifest control plane * make bundle Signed-off-by: Anand Francis Joseph <[email protected]> --------- Signed-off-by: Chetan Banavikalmutt <[email protected]> Signed-off-by: Anand Francis Joseph <[email protected]> Signed-off-by: iam-veeramalla <[email protected]> Co-authored-by: Chetan Banavikalmutt <[email protected]> Co-authored-by: Krzysztof Ostrowski <[email protected]> Co-authored-by: iam-veeramalla <[email protected]> Co-authored-by: Regina Scott <[email protected]>
anandf
added a commit
to anandf/argocd-operator
that referenced
this pull request
Jun 7, 2024
* fix: don't change the default policy to reencrypt if the TLS secret is present (argoproj-labs#1401) Signed-off-by: Chetan Banavikalmutt <[email protected]> Signed-off-by: Anand Francis Joseph <[email protected]> * Add SeccompProfile for PodSecurityStandards "restricted" to avoid Pod Security Violations on restricted namespaces (argoproj-labs#1288) * Add SeccompProfile for PSA restricted It is necessary to set the seccompProfile to RuntimeDefault to meet the PodSecurityStandards of restricted, which will be a common default in clusters. Otherwise the workloads will be evaluated as baseline and rejected, if not set otherwise in the namespace metadata. * fix: failing test Signed-off-by: iam-veeramalla <[email protected]> --------- Signed-off-by: iam-veeramalla <[email protected]> Co-authored-by: iam-veeramalla <[email protected]> Signed-off-by: Anand Francis Joseph <[email protected]> * Rebase master with 0.10.0 and 0.9.1 releases (argoproj-labs#1403) * argocd-operator v0.10.0 release (argoproj-labs#1343) * fix typo in metadata (argoproj-labs#1354) * update replaces version number for 0.10.0 to 0.9.1 (argoproj-labs#1365) * update make deploy manifests * rebase with 0.9.1 * fix bundle manifest control plane * make bundle Signed-off-by: Anand Francis Joseph <[email protected]> --------- Signed-off-by: Chetan Banavikalmutt <[email protected]> Signed-off-by: Anand Francis Joseph <[email protected]> Signed-off-by: iam-veeramalla <[email protected]> Co-authored-by: Chetan Banavikalmutt <[email protected]> Co-authored-by: Krzysztof Ostrowski <[email protected]> Co-authored-by: iam-veeramalla <[email protected]> Co-authored-by: Regina Scott <[email protected]> Signed-off-by: Anand Francis Joseph <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
What does this PR do / why we need it:
Have you updated the necessary documentation?
Which issue(s) this PR fixes:
Fixes #?
How to test changes / Special notes to the reviewer: