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

chore(gha): preemptively add 1p creds #5285

Merged
merged 1 commit into from
Dec 5, 2023
Merged

chore(gha): preemptively add 1p creds #5285

merged 1 commit into from
Dec 5, 2023

Conversation

curiositycasualty
Copy link
Contributor

@curiositycasualty curiositycasualty commented Dec 4, 2023

What this PR does / why we need it:

This change is required to accommodate the forthcoming work in Kong/kong-license#25

That work will change kong-license such that the license is sourced directly from 1Password, rather than it being sourced from Pulp using credentials from 1Password (as is the case today). Meaning that workflows needing to run Kong/kong-license's will require 1P credentials instead of the Pulp password.

This work is a necessary step in the deprecation of Pulp aka KAG-2247 / KAG-3254.

Leaving the Pulp password for now so that Kong/kong-license#25 can be merged after this PR.

Which issue this PR fixes:

N/A

Special notes for your reviewer:
N/A

PR Readiness Checklist:
N/A

Complete these before marking the PR as ready to review:

  • [N/A] the CHANGELOG.md release notes have been updated to reflect any significant (and particularly user-facing) changes introduced by this PR

@curiositycasualty curiositycasualty requested a review from a team as a code owner December 4, 2023 19:58
@CLAassistant
Copy link

CLAassistant commented Dec 4, 2023

CLA assistant check
All committers have signed the CLA.

Copy link

codecov bot commented Dec 4, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (efca134) 75.6% compared to head (1657dbe) 75.6%.

Additional details and impacted files
@@          Coverage Diff          @@
##            main   #5285   +/-   ##
=====================================
  Coverage   75.6%   75.6%           
=====================================
  Files        170     170           
  Lines      19370   19370           
=====================================
+ Hits       14648   14662   +14     
+ Misses      3896    3884   -12     
+ Partials     826     824    -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@randmonkey randmonkey added the ci/run-e2e Trigger e2e test run from PR label Dec 5, 2023
@team-k8s-bot
Copy link
Collaborator

E2E (targeted) tests with KIND-based clusters were started at https://github.com/Kong/kubernetes-ingress-controller/actions/runs/7095549717

@team-k8s-bot team-k8s-bot removed the ci/run-e2e Trigger e2e test run from PR label Dec 5, 2023
@randmonkey
Copy link
Contributor

randmonkey commented Dec 5, 2023

Thanks! Could you please tell us what is the next step to do in this repo after the PR get merged? @curiositycasualty

Copy link
Contributor

@rainest rainest left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@randmonkey it looks like nothing other than removing the old Pulp secret, I guess. As I understand it the secret is org-wide and the stuff that uses it is all bound up in the license action, so everything's already in place to start using the new flow once upstream merges the change.

Approved but left open in case there are further questions. Merged the others since it doesn't look like they contain anything that could potentially cause chicken-egg issues.

@curiositycasualty
Copy link
Contributor Author

@randmonkey & @rainest That's correct with one caveat: the removal of the pulp secret is optional (although the workflow will produce a deprecation warning until it is removed). This all Just Works™️ because passing non-applicable inputs to a github action in this way has no effect.

That's what the deprecationMessage portion of this is about: https://github.com/Kong/kong-license/pull/25/files?diff=split&w=0#diff-fab4d7fb461bc6fbe9587f6c03fff98102b1c744145edcf2a993f2ff7cb05a0dR5-R13

@curiositycasualty
Copy link
Contributor Author

This is safe to be merged ahead of Kong/kong-license#25

@rainest rainest merged commit e84786e into main Dec 5, 2023
180 of 181 checks passed
@rainest rainest deleted the chore/1p-prereq branch December 5, 2023 21:31
@team-k8s-bot
Copy link
Collaborator

The backport to release/2.12.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/2.12.x release/2.12.x
# Navigate to the new working tree
cd .worktrees/backport-release/2.12.x
# Create a new branch
git switch --create backport-5285-to-release/2.12.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e84786ebd14c9d3643c450d98a434f031545f481
# Push it to GitHub
git push --set-upstream origin backport-5285-to-release/2.12.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/2.12.x

Then, create a pull request where the base branch is release/2.12.x and the compare/head branch is backport-5285-to-release/2.12.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants