Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 72 additions & 12 deletions .github/workflows/pipeline.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,6 +114,9 @@
Deploy-NonProd:
runs-on: self-hosted-linux
needs: Publish
permissions:
contents: read
id-token: write # required for GitHub OIDC -> Vault
strategy:
max-parallel: 1
matrix:
Expand All@@ -129,13 +132,40 @@
- name: Setup kubectl
uses: azure/setup-kubectl@v4

# Keyless: GitHub OIDC -> Vault jwt auth. exportToken makes VAULT_TOKEN available to the mint step.
- name: Vault login (GitHub OIDC)
uses: hashicorp/vault-action@v3
with:
url: https://vault.support.tools
method: jwt
path: github-actions # the jwt auth mount
role: gha-website
jwtGithubAudience: https://github.com/SupportTools # matches bound_audiences
exportToken: true # -> VAULT_TOKEN env for the next step

# Mint the short-lived (1h), namespace-scoped Kubernetes token and build a kubeconfig from it.
# The kubernetes secrets engine generates on WRITE (PUT + kubernetes_namespace), so it must be
# requested explicitly here. In-cluster runner => talk to a1-ops-prd's own apiserver + in-cluster CA.
- name: Setup Kubeconfig
env:
VAULT_ADDR: https://vault.support.tools
run: |
echo "${{ secrets.KUBECONFIG_DEV }}" | base64 -d > kubeconfig
KUBE_TOKEN=$(curl -sf -H "X-Vault-Token: ${VAULT_TOKEN}" \
-X PUT -d '{"kubernetes_namespace":"arc-runners-supporttools"}' \
"${VAULT_ADDR}/v1/kubernetes-onprem/creds/website" \
| jq -r '.data.service_account_token')
Comment on lines +153 to +156

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Grant create before keeping the bootstrap branch

This kubeconfig is now sourced from the Vault-issued least-privilege token, but the deploy script still treats a missing supporttools-${ENVIRONMENT} Application as recoverable by piping argocd/${ENVIRONMENT}.yaml into kubectl apply below. The new role is scoped for the existing get/patch path, so if one of the six Applications is deleted or a cluster is rebuilt, this branch now fails with an RBAC error instead of recreating it as the old kubeconfig did; the same pattern exists in Deploy-Prod. Either give the token create on those Applications or replace the branch with a clear precondition failure.

Useful? React with 👍 / 👎.

test -n "$KUBE_TOKEN" && test "$KUBE_TOKEN" != null || { echo "::error::failed to mint K8s token"; exit 1; }
echo "::add-mask::$KUBE_TOKEN"
kubectl config set-cluster onprem \
--server=https://kubernetes.default.svc:443 \
--certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
--embed-certs=true --kubeconfig=kubeconfig
kubectl config set-credentials ci --token="${KUBE_TOKEN}" --kubeconfig=kubeconfig
kubectl config set-context ci --cluster=onprem --user=ci --namespace=argocd --kubeconfig=kubeconfig
kubectl config use-context ci --kubeconfig=kubeconfig
chmod 600 kubeconfig

- name: Deploy ArgoCD Project
run: kubectl --kubeconfig kubeconfig apply -f argocd/project.yaml
# ArgoCD AppProject (argocd/project.yaml) is managed by cluster-services; the scoped CI token cannot apply AppProjects.

- name: Deploy Environment - ${{ matrix.environment }}
run: |
Expand DownExpand Up@@ -174,7 +204,7 @@
echo "Application did not become healthy in time."
exit 1
fi

- name: Check if CDN Sync is needed
id: check-sync-cdn
run: |
Expand All@@ -188,6 +218,9 @@
Deploy-Prod:
runs-on: self-hosted-linux
needs: Deploy-NonProd
permissions:
contents: read
id-token: write # required for GitHub OIDC -> Vault
strategy:
max-parallel: 1
matrix:
Expand All@@ -203,13 +236,40 @@
- name: Setup kubectl
uses: azure/setup-kubectl@v4

# Keyless: GitHub OIDC -> Vault jwt auth. exportToken makes VAULT_TOKEN available to the mint step.
- name: Vault login (GitHub OIDC)
uses: hashicorp/vault-action@v3
with:
url: https://vault.support.tools
method: jwt
path: github-actions # the jwt auth mount
role: gha-website
jwtGithubAudience: https://github.com/SupportTools # matches bound_audiences
exportToken: true # -> VAULT_TOKEN env for the next step

# Mint the short-lived (1h), namespace-scoped Kubernetes token and build a kubeconfig from it.
# The kubernetes secrets engine generates on WRITE (PUT + kubernetes_namespace), so it must be
# requested explicitly here. In-cluster runner => talk to a1-ops-prd's own apiserver + in-cluster CA.
- name: Setup Kubeconfig
env:
VAULT_ADDR: https://vault.support.tools
run: |
echo "${{ secrets.KUBECONFIG_PROD }}" | base64 -d > kubeconfig
KUBE_TOKEN=$(curl -sf -H "X-Vault-Token: ${VAULT_TOKEN}" \
-X PUT -d '{"kubernetes_namespace":"arc-runners-supporttools"}' \
"${VAULT_ADDR}/v1/kubernetes-onprem/creds/website" \
| jq -r '.data.service_account_token')
test -n "$KUBE_TOKEN" && test "$KUBE_TOKEN" != null || { echo "::error::failed to mint K8s token"; exit 1; }
echo "::add-mask::$KUBE_TOKEN"
kubectl config set-cluster onprem \
--server=https://kubernetes.default.svc:443 \
--certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
--embed-certs=true --kubeconfig=kubeconfig
kubectl config set-credentials ci --token="${KUBE_TOKEN}" --kubeconfig=kubeconfig
kubectl config set-context ci --cluster=onprem --user=ci --namespace=argocd --kubeconfig=kubeconfig
kubectl config use-context ci --kubeconfig=kubeconfig
chmod 600 kubeconfig

- name: Deploy ArgoCD Project
run: kubectl --kubeconfig kubeconfig apply -f argocd/project.yaml
# ArgoCD AppProject (argocd/project.yaml) is managed by cluster-services; the scoped CI token cannot apply AppProjects.

- name: Deploy Environment - ${{ matrix.environment }}
run: |
Expand DownExpand Up@@ -248,34 +308,34 @@
echo "Application did not become healthy in time."
exit 1
fi

- name: Check if CDN Sync is needed
id: check-sync-cdn
run: |
if [[ "${{ matrix.environment }}" == "qas" || "${{ matrix.environment }}" == "tst" || "${{ matrix.environment }}" == "stg" || "${{ matrix.environment }}" == "prd" ]]; then
echo "synccdn=true" >> $GITHUB_OUTPUT
else
echo "synccdn=false" >> $GITHUB_OUTPUT
fi
fi

# Sync-CDN:
# runs-on: ubuntu-latest
# needs: Deploy
# if: needs.Deploy.outputs.synccdn_needed == 'true'

# steps:
# - name: Checkout repository
# uses: actions/checkout@v3
# with:
# fetch-depth: 0 # Fetch all history for proper change detection

# - name: Install AWS CLI
# run: |
# curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
# unzip awscliv2.zip
# sudo ./aws/install
# aws --version

# - name: Sync to Wasabi S3 bucket
# env:
# AWS_ACCESS_KEY_ID: ${{ secrets.WASABI_ACCESS_KEY }}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
ci: keyless K8s creds via GitHub OIDC->Vault (retire KUBECONFIG_DEV/PROD) by mattmattox · Pull Request #76 · SupportTools/website · GitHub
Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 72 additions & 12 deletions .github/workflows/pipeline.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,6 +114,9 @@
Deploy-NonProd:
runs-on: self-hosted-linux
needs: Publish
permissions:
contents: read
id-token: write # required for GitHub OIDC -> Vault
strategy:
max-parallel: 1
matrix:
Expand All@@ -129,13 +132,40 @@
- name: Setup kubectl
uses: azure/setup-kubectl@v4

# Keyless: GitHub OIDC -> Vault jwt auth. exportToken makes VAULT_TOKEN available to the mint step.
- name: Vault login (GitHub OIDC)
uses: hashicorp/vault-action@v3
with:
url: https://vault.support.tools
method: jwt
path: github-actions # the jwt auth mount
role: gha-website
jwtGithubAudience: https://github.com/SupportTools # matches bound_audiences
exportToken: true # -> VAULT_TOKEN env for the next step

# Mint the short-lived (1h), namespace-scoped Kubernetes token and build a kubeconfig from it.
# The kubernetes secrets engine generates on WRITE (PUT + kubernetes_namespace), so it must be
# requested explicitly here. In-cluster runner => talk to a1-ops-prd's own apiserver + in-cluster CA.
- name: Setup Kubeconfig
env:
VAULT_ADDR: https://vault.support.tools
run: |
echo "${{ secrets.KUBECONFIG_DEV }}" | base64 -d > kubeconfig
KUBE_TOKEN=$(curl -sf -H "X-Vault-Token: ${VAULT_TOKEN}" \
-X PUT -d '{"kubernetes_namespace":"arc-runners-supporttools"}' \
"${VAULT_ADDR}/v1/kubernetes-onprem/creds/website" \
| jq -r '.data.service_account_token')
Comment on lines +153 to +156

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Grant create before keeping the bootstrap branch

This kubeconfig is now sourced from the Vault-issued least-privilege token, but the deploy script still treats a missing supporttools-${ENVIRONMENT} Application as recoverable by piping argocd/${ENVIRONMENT}.yaml into kubectl apply below. The new role is scoped for the existing get/patch path, so if one of the six Applications is deleted or a cluster is rebuilt, this branch now fails with an RBAC error instead of recreating it as the old kubeconfig did; the same pattern exists in Deploy-Prod. Either give the token create on those Applications or replace the branch with a clear precondition failure.

Useful? React with 👍 / 👎.

test -n "$KUBE_TOKEN" && test "$KUBE_TOKEN" != null || { echo "::error::failed to mint K8s token"; exit 1; }
echo "::add-mask::$KUBE_TOKEN"
kubectl config set-cluster onprem \
--server=https://kubernetes.default.svc:443 \
--certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
--embed-certs=true --kubeconfig=kubeconfig
kubectl config set-credentials ci --token="${KUBE_TOKEN}" --kubeconfig=kubeconfig
kubectl config set-context ci --cluster=onprem --user=ci --namespace=argocd --kubeconfig=kubeconfig
kubectl config use-context ci --kubeconfig=kubeconfig
chmod 600 kubeconfig

- name: Deploy ArgoCD Project
run: kubectl --kubeconfig kubeconfig apply -f argocd/project.yaml
# ArgoCD AppProject (argocd/project.yaml) is managed by cluster-services; the scoped CI token cannot apply AppProjects.

- name: Deploy Environment - ${{ matrix.environment }}
run: |
Expand DownExpand Up@@ -174,7 +204,7 @@
echo "Application did not become healthy in time."
exit 1
fi

- name: Check if CDN Sync is needed
id: check-sync-cdn
run: |
Expand All@@ -188,6 +218,9 @@
Deploy-Prod:
runs-on: self-hosted-linux
needs: Deploy-NonProd
permissions:
contents: read
id-token: write # required for GitHub OIDC -> Vault
strategy:
max-parallel: 1
matrix:
Expand All@@ -203,13 +236,40 @@
- name: Setup kubectl
uses: azure/setup-kubectl@v4

# Keyless: GitHub OIDC -> Vault jwt auth. exportToken makes VAULT_TOKEN available to the mint step.
- name: Vault login (GitHub OIDC)
uses: hashicorp/vault-action@v3
with:
url: https://vault.support.tools
method: jwt
path: github-actions # the jwt auth mount
role: gha-website
jwtGithubAudience: https://github.com/SupportTools # matches bound_audiences
exportToken: true # -> VAULT_TOKEN env for the next step

# Mint the short-lived (1h), namespace-scoped Kubernetes token and build a kubeconfig from it.
# The kubernetes secrets engine generates on WRITE (PUT + kubernetes_namespace), so it must be
# requested explicitly here. In-cluster runner => talk to a1-ops-prd's own apiserver + in-cluster CA.
- name: Setup Kubeconfig
env:
VAULT_ADDR: https://vault.support.tools
run: |
echo "${{ secrets.KUBECONFIG_PROD }}" | base64 -d > kubeconfig
KUBE_TOKEN=$(curl -sf -H "X-Vault-Token: ${VAULT_TOKEN}" \
-X PUT -d '{"kubernetes_namespace":"arc-runners-supporttools"}' \
"${VAULT_ADDR}/v1/kubernetes-onprem/creds/website" \
| jq -r '.data.service_account_token')
test -n "$KUBE_TOKEN" && test "$KUBE_TOKEN" != null || { echo "::error::failed to mint K8s token"; exit 1; }
echo "::add-mask::$KUBE_TOKEN"
kubectl config set-cluster onprem \
--server=https://kubernetes.default.svc:443 \
--certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
--embed-certs=true --kubeconfig=kubeconfig
kubectl config set-credentials ci --token="${KUBE_TOKEN}" --kubeconfig=kubeconfig
kubectl config set-context ci --cluster=onprem --user=ci --namespace=argocd --kubeconfig=kubeconfig
kubectl config use-context ci --kubeconfig=kubeconfig
chmod 600 kubeconfig

- name: Deploy ArgoCD Project
run: kubectl --kubeconfig kubeconfig apply -f argocd/project.yaml
# ArgoCD AppProject (argocd/project.yaml) is managed by cluster-services; the scoped CI token cannot apply AppProjects.

- name: Deploy Environment - ${{ matrix.environment }}
run: |
Expand DownExpand Up@@ -248,34 +308,34 @@
echo "Application did not become healthy in time."
exit 1
fi

- name: Check if CDN Sync is needed
id: check-sync-cdn
run: |
if [[ "${{ matrix.environment }}" == "qas" || "${{ matrix.environment }}" == "tst" || "${{ matrix.environment }}" == "stg" || "${{ matrix.environment }}" == "prd" ]]; then
echo "synccdn=true" >> $GITHUB_OUTPUT
else
echo "synccdn=false" >> $GITHUB_OUTPUT
fi
fi

# Sync-CDN:
# runs-on: ubuntu-latest
# needs: Deploy
# if: needs.Deploy.outputs.synccdn_needed == 'true'

# steps:
# - name: Checkout repository
# uses: actions/checkout@v3
# with:
# fetch-depth: 0 # Fetch all history for proper change detection

# - name: Install AWS CLI
# run: |
# curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
# unzip awscliv2.zip
# sudo ./aws/install
# aws --version

# - name: Sync to Wasabi S3 bucket
# env:
# AWS_ACCESS_KEY_ID: ${{ secrets.WASABI_ACCESS_KEY }}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ci: keyless K8s creds via GitHub OIDC->Vault (retire KUBECONFIG_DEV/PROD) by mattmattox · Pull Request #76 · SupportTools/website · GitHub
Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 72 additions & 12 deletions .github/workflows/pipeline.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,6 +114,9 @@
Deploy-NonProd:
runs-on: self-hosted-linux
needs: Publish
permissions:
contents: read
id-token: write # required for GitHub OIDC -> Vault
strategy:
max-parallel: 1
matrix:
Expand All@@ -129,13 +132,40 @@
- name: Setup kubectl
uses: azure/setup-kubectl@v4

# Keyless: GitHub OIDC -> Vault jwt auth. exportToken makes VAULT_TOKEN available to the mint step.
- name: Vault login (GitHub OIDC)
uses: hashicorp/vault-action@v3
with:
url: https://vault.support.tools
method: jwt
path: github-actions # the jwt auth mount
role: gha-website
jwtGithubAudience: https://github.com/SupportTools # matches bound_audiences
exportToken: true # -> VAULT_TOKEN env for the next step

# Mint the short-lived (1h), namespace-scoped Kubernetes token and build a kubeconfig from it.
# The kubernetes secrets engine generates on WRITE (PUT + kubernetes_namespace), so it must be
# requested explicitly here. In-cluster runner => talk to a1-ops-prd's own apiserver + in-cluster CA.
- name: Setup Kubeconfig
env:
VAULT_ADDR: https://vault.support.tools
run: |
echo "${{ secrets.KUBECONFIG_DEV }}" | base64 -d > kubeconfig
KUBE_TOKEN=$(curl -sf -H "X-Vault-Token: ${VAULT_TOKEN}" \
-X PUT -d '{"kubernetes_namespace":"arc-runners-supporttools"}' \
"${VAULT_ADDR}/v1/kubernetes-onprem/creds/website" \
| jq -r '.data.service_account_token')
Comment on lines +153 to +156

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Grant create before keeping the bootstrap branch

This kubeconfig is now sourced from the Vault-issued least-privilege token, but the deploy script still treats a missing supporttools-${ENVIRONMENT} Application as recoverable by piping argocd/${ENVIRONMENT}.yaml into kubectl apply below. The new role is scoped for the existing get/patch path, so if one of the six Applications is deleted or a cluster is rebuilt, this branch now fails with an RBAC error instead of recreating it as the old kubeconfig did; the same pattern exists in Deploy-Prod. Either give the token create on those Applications or replace the branch with a clear precondition failure.

Useful? React with 👍 / 👎.

test -n "$KUBE_TOKEN" && test "$KUBE_TOKEN" != null || { echo "::error::failed to mint K8s token"; exit 1; }
echo "::add-mask::$KUBE_TOKEN"
kubectl config set-cluster onprem \
--server=https://kubernetes.default.svc:443 \
--certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
--embed-certs=true --kubeconfig=kubeconfig
kubectl config set-credentials ci --token="${KUBE_TOKEN}" --kubeconfig=kubeconfig
kubectl config set-context ci --cluster=onprem --user=ci --namespace=argocd --kubeconfig=kubeconfig
kubectl config use-context ci --kubeconfig=kubeconfig
chmod 600 kubeconfig

- name: Deploy ArgoCD Project
run: kubectl --kubeconfig kubeconfig apply -f argocd/project.yaml
# ArgoCD AppProject (argocd/project.yaml) is managed by cluster-services; the scoped CI token cannot apply AppProjects.

- name: Deploy Environment - ${{ matrix.environment }}
run: |
Expand DownExpand Up@@ -174,7 +204,7 @@
echo "Application did not become healthy in time."
exit 1
fi

- name: Check if CDN Sync is needed
id: check-sync-cdn
run: |
Expand All@@ -188,6 +218,9 @@
Deploy-Prod:
runs-on: self-hosted-linux
needs: Deploy-NonProd
permissions:
contents: read
id-token: write # required for GitHub OIDC -> Vault
strategy:
max-parallel: 1
matrix:
Expand All@@ -203,13 +236,40 @@
- name: Setup kubectl
uses: azure/setup-kubectl@v4

# Keyless: GitHub OIDC -> Vault jwt auth. exportToken makes VAULT_TOKEN available to the mint step.
- name: Vault login (GitHub OIDC)
uses: hashicorp/vault-action@v3
with:
url: https://vault.support.tools
method: jwt
path: github-actions # the jwt auth mount
role: gha-website
jwtGithubAudience: https://github.com/SupportTools # matches bound_audiences
exportToken: true # -> VAULT_TOKEN env for the next step

# Mint the short-lived (1h), namespace-scoped Kubernetes token and build a kubeconfig from it.
# The kubernetes secrets engine generates on WRITE (PUT + kubernetes_namespace), so it must be
# requested explicitly here. In-cluster runner => talk to a1-ops-prd's own apiserver + in-cluster CA.
- name: Setup Kubeconfig
env:
VAULT_ADDR: https://vault.support.tools
run: |
echo "${{ secrets.KUBECONFIG_PROD }}" | base64 -d > kubeconfig
KUBE_TOKEN=$(curl -sf -H "X-Vault-Token: ${VAULT_TOKEN}" \
-X PUT -d '{"kubernetes_namespace":"arc-runners-supporttools"}' \
"${VAULT_ADDR}/v1/kubernetes-onprem/creds/website" \
| jq -r '.data.service_account_token')
test -n "$KUBE_TOKEN" && test "$KUBE_TOKEN" != null || { echo "::error::failed to mint K8s token"; exit 1; }
echo "::add-mask::$KUBE_TOKEN"
kubectl config set-cluster onprem \
--server=https://kubernetes.default.svc:443 \
--certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
--embed-certs=true --kubeconfig=kubeconfig
kubectl config set-credentials ci --token="${KUBE_TOKEN}" --kubeconfig=kubeconfig
kubectl config set-context ci --cluster=onprem --user=ci --namespace=argocd --kubeconfig=kubeconfig
kubectl config use-context ci --kubeconfig=kubeconfig
chmod 600 kubeconfig

- name: Deploy ArgoCD Project
run: kubectl --kubeconfig kubeconfig apply -f argocd/project.yaml
# ArgoCD AppProject (argocd/project.yaml) is managed by cluster-services; the scoped CI token cannot apply AppProjects.

- name: Deploy Environment - ${{ matrix.environment }}
run: |
Expand DownExpand Up@@ -248,34 +308,34 @@
echo "Application did not become healthy in time."
exit 1
fi

- name: Check if CDN Sync is needed
id: check-sync-cdn
run: |
if [[ "${{ matrix.environment }}" == "qas" || "${{ matrix.environment }}" == "tst" || "${{ matrix.environment }}" == "stg" || "${{ matrix.environment }}" == "prd" ]]; then
echo "synccdn=true" >> $GITHUB_OUTPUT
else
echo "synccdn=false" >> $GITHUB_OUTPUT
fi
fi

# Sync-CDN:
# runs-on: ubuntu-latest
# needs: Deploy
# if: needs.Deploy.outputs.synccdn_needed == 'true'

# steps:
# - name: Checkout repository
# uses: actions/checkout@v3
# with:
# fetch-depth: 0 # Fetch all history for proper change detection

# - name: Install AWS CLI
# run: |
# curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
# unzip awscliv2.zip
# sudo ./aws/install
# aws --version

# - name: Sync to Wasabi S3 bucket
# env:
# AWS_ACCESS_KEY_ID: ${{ secrets.WASABI_ACCESS_KEY }}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ci: keyless K8s creds via GitHub OIDC->Vault (retire KUBECONFIG_DEV/PROD) by mattmattox · Pull Request #76 · SupportTools/website · GitHub
Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 72 additions & 12 deletions .github/workflows/pipeline.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,6 +114,9 @@
Deploy-NonProd:
runs-on: self-hosted-linux
needs: Publish
permissions:
contents: read
id-token: write # required for GitHub OIDC -> Vault
strategy:
max-parallel: 1
matrix:
Expand All@@ -129,13 +132,40 @@
- name: Setup kubectl
uses: azure/setup-kubectl@v4

# Keyless: GitHub OIDC -> Vault jwt auth. exportToken makes VAULT_TOKEN available to the mint step.
- name: Vault login (GitHub OIDC)
uses: hashicorp/vault-action@v3
with:
url: https://vault.support.tools
method: jwt
path: github-actions # the jwt auth mount
role: gha-website
jwtGithubAudience: https://github.com/SupportTools # matches bound_audiences
exportToken: true # -> VAULT_TOKEN env for the next step

# Mint the short-lived (1h), namespace-scoped Kubernetes token and build a kubeconfig from it.
# The kubernetes secrets engine generates on WRITE (PUT + kubernetes_namespace), so it must be
# requested explicitly here. In-cluster runner => talk to a1-ops-prd's own apiserver + in-cluster CA.
- name: Setup Kubeconfig
env:
VAULT_ADDR: https://vault.support.tools
run: |
echo "${{ secrets.KUBECONFIG_DEV }}" | base64 -d > kubeconfig
KUBE_TOKEN=$(curl -sf -H "X-Vault-Token: ${VAULT_TOKEN}" \
-X PUT -d '{"kubernetes_namespace":"arc-runners-supporttools"}' \
"${VAULT_ADDR}/v1/kubernetes-onprem/creds/website" \
| jq -r '.data.service_account_token')
Comment on lines +153 to +156

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Grant create before keeping the bootstrap branch

This kubeconfig is now sourced from the Vault-issued least-privilege token, but the deploy script still treats a missing supporttools-${ENVIRONMENT} Application as recoverable by piping argocd/${ENVIRONMENT}.yaml into kubectl apply below. The new role is scoped for the existing get/patch path, so if one of the six Applications is deleted or a cluster is rebuilt, this branch now fails with an RBAC error instead of recreating it as the old kubeconfig did; the same pattern exists in Deploy-Prod. Either give the token create on those Applications or replace the branch with a clear precondition failure.

Useful? React with 👍 / 👎.

test -n "$KUBE_TOKEN" && test "$KUBE_TOKEN" != null || { echo "::error::failed to mint K8s token"; exit 1; }
echo "::add-mask::$KUBE_TOKEN"
kubectl config set-cluster onprem \
--server=https://kubernetes.default.svc:443 \
--certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
--embed-certs=true --kubeconfig=kubeconfig
kubectl config set-credentials ci --token="${KUBE_TOKEN}" --kubeconfig=kubeconfig
kubectl config set-context ci --cluster=onprem --user=ci --namespace=argocd --kubeconfig=kubeconfig
kubectl config use-context ci --kubeconfig=kubeconfig
chmod 600 kubeconfig

- name: Deploy ArgoCD Project
run: kubectl --kubeconfig kubeconfig apply -f argocd/project.yaml
# ArgoCD AppProject (argocd/project.yaml) is managed by cluster-services; the scoped CI token cannot apply AppProjects.

- name: Deploy Environment - ${{ matrix.environment }}
run: |
Expand DownExpand Up@@ -174,7 +204,7 @@
echo "Application did not become healthy in time."
exit 1
fi

- name: Check if CDN Sync is needed
id: check-sync-cdn
run: |
Expand All@@ -188,6 +218,9 @@
Deploy-Prod:
runs-on: self-hosted-linux
needs: Deploy-NonProd
permissions:
contents: read
id-token: write # required for GitHub OIDC -> Vault
strategy:
max-parallel: 1
matrix:
Expand All@@ -203,13 +236,40 @@
- name: Setup kubectl
uses: azure/setup-kubectl@v4

# Keyless: GitHub OIDC -> Vault jwt auth. exportToken makes VAULT_TOKEN available to the mint step.
- name: Vault login (GitHub OIDC)
uses: hashicorp/vault-action@v3
with:
url: https://vault.support.tools
method: jwt
path: github-actions # the jwt auth mount
role: gha-website
jwtGithubAudience: https://github.com/SupportTools # matches bound_audiences
exportToken: true # -> VAULT_TOKEN env for the next step

# Mint the short-lived (1h), namespace-scoped Kubernetes token and build a kubeconfig from it.
# The kubernetes secrets engine generates on WRITE (PUT + kubernetes_namespace), so it must be
# requested explicitly here. In-cluster runner => talk to a1-ops-prd's own apiserver + in-cluster CA.
- name: Setup Kubeconfig
env:
VAULT_ADDR: https://vault.support.tools
run: |
echo "${{ secrets.KUBECONFIG_PROD }}" | base64 -d > kubeconfig
KUBE_TOKEN=$(curl -sf -H "X-Vault-Token: ${VAULT_TOKEN}" \
-X PUT -d '{"kubernetes_namespace":"arc-runners-supporttools"}' \
"${VAULT_ADDR}/v1/kubernetes-onprem/creds/website" \
| jq -r '.data.service_account_token')
test -n "$KUBE_TOKEN" && test "$KUBE_TOKEN" != null || { echo "::error::failed to mint K8s token"; exit 1; }
echo "::add-mask::$KUBE_TOKEN"
kubectl config set-cluster onprem \
--server=https://kubernetes.default.svc:443 \
--certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
--embed-certs=true --kubeconfig=kubeconfig
kubectl config set-credentials ci --token="${KUBE_TOKEN}" --kubeconfig=kubeconfig
kubectl config set-context ci --cluster=onprem --user=ci --namespace=argocd --kubeconfig=kubeconfig
kubectl config use-context ci --kubeconfig=kubeconfig
chmod 600 kubeconfig

- name: Deploy ArgoCD Project
run: kubectl --kubeconfig kubeconfig apply -f argocd/project.yaml
# ArgoCD AppProject (argocd/project.yaml) is managed by cluster-services; the scoped CI token cannot apply AppProjects.

- name: Deploy Environment - ${{ matrix.environment }}
run: |
Expand DownExpand Up@@ -248,34 +308,34 @@
echo "Application did not become healthy in time."
exit 1
fi

- name: Check if CDN Sync is needed
id: check-sync-cdn
run: |
if [[ "${{ matrix.environment }}" == "qas" || "${{ matrix.environment }}" == "tst" || "${{ matrix.environment }}" == "stg" || "${{ matrix.environment }}" == "prd" ]]; then
echo "synccdn=true" >> $GITHUB_OUTPUT
else
echo "synccdn=false" >> $GITHUB_OUTPUT
fi
fi

# Sync-CDN:
# runs-on: ubuntu-latest
# needs: Deploy
# if: needs.Deploy.outputs.synccdn_needed == 'true'

# steps:
# - name: Checkout repository
# uses: actions/checkout@v3
# with:
# fetch-depth: 0 # Fetch all history for proper change detection

# - name: Install AWS CLI
# run: |
# curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
# unzip awscliv2.zip
# sudo ./aws/install
# aws --version

# - name: Sync to Wasabi S3 bucket
# env:
# AWS_ACCESS_KEY_ID: ${{ secrets.WASABI_ACCESS_KEY }}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' ci: keyless K8s creds via GitHub OIDC->Vault (retire KUBECONFIG_DEV/PROD) by mattmattox · Pull Request #76 · SupportTools/website · GitHub
Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 72 additions & 12 deletions .github/workflows/pipeline.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,6 +114,9 @@
Deploy-NonProd:
runs-on: self-hosted-linux
needs: Publish
permissions:
contents: read
id-token: write # required for GitHub OIDC -> Vault
strategy:
max-parallel: 1
matrix:
Expand All@@ -129,13 +132,40 @@
- name: Setup kubectl
uses: azure/setup-kubectl@v4

# Keyless: GitHub OIDC -> Vault jwt auth. exportToken makes VAULT_TOKEN available to the mint step.
- name: Vault login (GitHub OIDC)
uses: hashicorp/vault-action@v3
with:
url: https://vault.support.tools
method: jwt
path: github-actions # the jwt auth mount
role: gha-website
jwtGithubAudience: https://github.com/SupportTools # matches bound_audiences
exportToken: true # -> VAULT_TOKEN env for the next step

# Mint the short-lived (1h), namespace-scoped Kubernetes token and build a kubeconfig from it.
# The kubernetes secrets engine generates on WRITE (PUT + kubernetes_namespace), so it must be
# requested explicitly here. In-cluster runner => talk to a1-ops-prd's own apiserver + in-cluster CA.
- name: Setup Kubeconfig
env:
VAULT_ADDR: https://vault.support.tools
run: |
echo "${{ secrets.KUBECONFIG_DEV }}" | base64 -d > kubeconfig
KUBE_TOKEN=$(curl -sf -H "X-Vault-Token: ${VAULT_TOKEN}" \
-X PUT -d '{"kubernetes_namespace":"arc-runners-supporttools"}' \
"${VAULT_ADDR}/v1/kubernetes-onprem/creds/website" \
| jq -r '.data.service_account_token')
Comment on lines +153 to +156

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Grant create before keeping the bootstrap branch

This kubeconfig is now sourced from the Vault-issued least-privilege token, but the deploy script still treats a missing supporttools-${ENVIRONMENT} Application as recoverable by piping argocd/${ENVIRONMENT}.yaml into kubectl apply below. The new role is scoped for the existing get/patch path, so if one of the six Applications is deleted or a cluster is rebuilt, this branch now fails with an RBAC error instead of recreating it as the old kubeconfig did; the same pattern exists in Deploy-Prod. Either give the token create on those Applications or replace the branch with a clear precondition failure.

Useful? React with 👍 / 👎.

test -n "$KUBE_TOKEN" && test "$KUBE_TOKEN" != null || { echo "::error::failed to mint K8s token"; exit 1; }
echo "::add-mask::$KUBE_TOKEN"
kubectl config set-cluster onprem \
--server=https://kubernetes.default.svc:443 \
--certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
--embed-certs=true --kubeconfig=kubeconfig
kubectl config set-credentials ci --token="${KUBE_TOKEN}" --kubeconfig=kubeconfig
kubectl config set-context ci --cluster=onprem --user=ci --namespace=argocd --kubeconfig=kubeconfig
kubectl config use-context ci --kubeconfig=kubeconfig
chmod 600 kubeconfig

- name: Deploy ArgoCD Project
run: kubectl --kubeconfig kubeconfig apply -f argocd/project.yaml
# ArgoCD AppProject (argocd/project.yaml) is managed by cluster-services; the scoped CI token cannot apply AppProjects.

- name: Deploy Environment - ${{ matrix.environment }}
run: |
Expand DownExpand Up@@ -174,7 +204,7 @@
echo "Application did not become healthy in time."
exit 1
fi

- name: Check if CDN Sync is needed
id: check-sync-cdn
run: |
Expand All@@ -188,6 +218,9 @@
Deploy-Prod:
runs-on: self-hosted-linux
needs: Deploy-NonProd
permissions:
contents: read
id-token: write # required for GitHub OIDC -> Vault
strategy:
max-parallel: 1
matrix:
Expand All@@ -203,13 +236,40 @@
- name: Setup kubectl
uses: azure/setup-kubectl@v4

# Keyless: GitHub OIDC -> Vault jwt auth. exportToken makes VAULT_TOKEN available to the mint step.
- name: Vault login (GitHub OIDC)
uses: hashicorp/vault-action@v3
with:
url: https://vault.support.tools
method: jwt
path: github-actions # the jwt auth mount
role: gha-website
jwtGithubAudience: https://github.com/SupportTools # matches bound_audiences
exportToken: true # -> VAULT_TOKEN env for the next step

# Mint the short-lived (1h), namespace-scoped Kubernetes token and build a kubeconfig from it.
# The kubernetes secrets engine generates on WRITE (PUT + kubernetes_namespace), so it must be
# requested explicitly here. In-cluster runner => talk to a1-ops-prd's own apiserver + in-cluster CA.
- name: Setup Kubeconfig
env:
VAULT_ADDR: https://vault.support.tools
run: |
echo "${{ secrets.KUBECONFIG_PROD }}" | base64 -d > kubeconfig
KUBE_TOKEN=$(curl -sf -H "X-Vault-Token: ${VAULT_TOKEN}" \
-X PUT -d '{"kubernetes_namespace":"arc-runners-supporttools"}' \
"${VAULT_ADDR}/v1/kubernetes-onprem/creds/website" \
| jq -r '.data.service_account_token')
test -n "$KUBE_TOKEN" && test "$KUBE_TOKEN" != null || { echo "::error::failed to mint K8s token"; exit 1; }
echo "::add-mask::$KUBE_TOKEN"
kubectl config set-cluster onprem \
--server=https://kubernetes.default.svc:443 \
--certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
--embed-certs=true --kubeconfig=kubeconfig
kubectl config set-credentials ci --token="${KUBE_TOKEN}" --kubeconfig=kubeconfig
kubectl config set-context ci --cluster=onprem --user=ci --namespace=argocd --kubeconfig=kubeconfig
kubectl config use-context ci --kubeconfig=kubeconfig
chmod 600 kubeconfig

- name: Deploy ArgoCD Project
run: kubectl --kubeconfig kubeconfig apply -f argocd/project.yaml
# ArgoCD AppProject (argocd/project.yaml) is managed by cluster-services; the scoped CI token cannot apply AppProjects.

- name: Deploy Environment - ${{ matrix.environment }}
run: |
Expand DownExpand Up@@ -248,34 +308,34 @@
echo "Application did not become healthy in time."
exit 1
fi

- name: Check if CDN Sync is needed
id: check-sync-cdn
run: |
if [[ "${{ matrix.environment }}" == "qas" || "${{ matrix.environment }}" == "tst" || "${{ matrix.environment }}" == "stg" || "${{ matrix.environment }}" == "prd" ]]; then
echo "synccdn=true" >> $GITHUB_OUTPUT
else
echo "synccdn=false" >> $GITHUB_OUTPUT
fi
fi

# Sync-CDN:
# runs-on: ubuntu-latest
# needs: Deploy
# if: needs.Deploy.outputs.synccdn_needed == 'true'

# steps:
# - name: Checkout repository
# uses: actions/checkout@v3
# with:
# fetch-depth: 0 # Fetch all history for proper change detection

# - name: Install AWS CLI
# run: |
# curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
# unzip awscliv2.zip
# sudo ./aws/install
# aws --version

# - name: Sync to Wasabi S3 bucket
# env:
# AWS_ACCESS_KEY_ID: ${{ secrets.WASABI_ACCESS_KEY }}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ci: keyless K8s creds via GitHub OIDC->Vault (retire KUBECONFIG_DEV/PROD) by mattmattox · Pull Request #76 · SupportTools/website · GitHub
Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 72 additions & 12 deletions .github/workflows/pipeline.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,6 +114,9 @@
Deploy-NonProd:
runs-on: self-hosted-linux
needs: Publish
permissions:
contents: read
id-token: write # required for GitHub OIDC -> Vault
strategy:
max-parallel: 1
matrix:
Expand All@@ -129,13 +132,40 @@
- name: Setup kubectl
uses: azure/setup-kubectl@v4

# Keyless: GitHub OIDC -> Vault jwt auth. exportToken makes VAULT_TOKEN available to the mint step.
- name: Vault login (GitHub OIDC)
uses: hashicorp/vault-action@v3
with:
url: https://vault.support.tools
method: jwt
path: github-actions # the jwt auth mount
role: gha-website
jwtGithubAudience: https://github.com/SupportTools # matches bound_audiences
exportToken: true # -> VAULT_TOKEN env for the next step

# Mint the short-lived (1h), namespace-scoped Kubernetes token and build a kubeconfig from it.
# The kubernetes secrets engine generates on WRITE (PUT + kubernetes_namespace), so it must be
# requested explicitly here. In-cluster runner => talk to a1-ops-prd's own apiserver + in-cluster CA.
- name: Setup Kubeconfig
env:
VAULT_ADDR: https://vault.support.tools
run: |
echo "${{ secrets.KUBECONFIG_DEV }}" | base64 -d > kubeconfig
KUBE_TOKEN=$(curl -sf -H "X-Vault-Token: ${VAULT_TOKEN}" \
-X PUT -d '{"kubernetes_namespace":"arc-runners-supporttools"}' \
"${VAULT_ADDR}/v1/kubernetes-onprem/creds/website" \
| jq -r '.data.service_account_token')
Comment on lines +153 to +156

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Grant create before keeping the bootstrap branch

This kubeconfig is now sourced from the Vault-issued least-privilege token, but the deploy script still treats a missing supporttools-${ENVIRONMENT} Application as recoverable by piping argocd/${ENVIRONMENT}.yaml into kubectl apply below. The new role is scoped for the existing get/patch path, so if one of the six Applications is deleted or a cluster is rebuilt, this branch now fails with an RBAC error instead of recreating it as the old kubeconfig did; the same pattern exists in Deploy-Prod. Either give the token create on those Applications or replace the branch with a clear precondition failure.

Useful? React with 👍 / 👎.

test -n "$KUBE_TOKEN" && test "$KUBE_TOKEN" != null || { echo "::error::failed to mint K8s token"; exit 1; }
echo "::add-mask::$KUBE_TOKEN"
kubectl config set-cluster onprem \
--server=https://kubernetes.default.svc:443 \
--certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
--embed-certs=true --kubeconfig=kubeconfig
kubectl config set-credentials ci --token="${KUBE_TOKEN}" --kubeconfig=kubeconfig
kubectl config set-context ci --cluster=onprem --user=ci --namespace=argocd --kubeconfig=kubeconfig
kubectl config use-context ci --kubeconfig=kubeconfig
chmod 600 kubeconfig

- name: Deploy ArgoCD Project
run: kubectl --kubeconfig kubeconfig apply -f argocd/project.yaml
# ArgoCD AppProject (argocd/project.yaml) is managed by cluster-services; the scoped CI token cannot apply AppProjects.

- name: Deploy Environment - ${{ matrix.environment }}
run: |
Expand DownExpand Up@@ -174,7 +204,7 @@
echo "Application did not become healthy in time."
exit 1
fi

- name: Check if CDN Sync is needed
id: check-sync-cdn
run: |
Expand All@@ -188,6 +218,9 @@
Deploy-Prod:
runs-on: self-hosted-linux
needs: Deploy-NonProd
permissions:
contents: read
id-token: write # required for GitHub OIDC -> Vault
strategy:
max-parallel: 1
matrix:
Expand All@@ -203,13 +236,40 @@
- name: Setup kubectl
uses: azure/setup-kubectl@v4

# Keyless: GitHub OIDC -> Vault jwt auth. exportToken makes VAULT_TOKEN available to the mint step.
- name: Vault login (GitHub OIDC)
uses: hashicorp/vault-action@v3
with:
url: https://vault.support.tools
method: jwt
path: github-actions # the jwt auth mount
role: gha-website
jwtGithubAudience: https://github.com/SupportTools # matches bound_audiences
exportToken: true # -> VAULT_TOKEN env for the next step

# Mint the short-lived (1h), namespace-scoped Kubernetes token and build a kubeconfig from it.
# The kubernetes secrets engine generates on WRITE (PUT + kubernetes_namespace), so it must be
# requested explicitly here. In-cluster runner => talk to a1-ops-prd's own apiserver + in-cluster CA.
- name: Setup Kubeconfig
env:
VAULT_ADDR: https://vault.support.tools
run: |
echo "${{ secrets.KUBECONFIG_PROD }}" | base64 -d > kubeconfig
KUBE_TOKEN=$(curl -sf -H "X-Vault-Token: ${VAULT_TOKEN}" \
-X PUT -d '{"kubernetes_namespace":"arc-runners-supporttools"}' \
"${VAULT_ADDR}/v1/kubernetes-onprem/creds/website" \
| jq -r '.data.service_account_token')
test -n "$KUBE_TOKEN" && test "$KUBE_TOKEN" != null || { echo "::error::failed to mint K8s token"; exit 1; }
echo "::add-mask::$KUBE_TOKEN"
kubectl config set-cluster onprem \
--server=https://kubernetes.default.svc:443 \
--certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
--embed-certs=true --kubeconfig=kubeconfig
kubectl config set-credentials ci --token="${KUBE_TOKEN}" --kubeconfig=kubeconfig
kubectl config set-context ci --cluster=onprem --user=ci --namespace=argocd --kubeconfig=kubeconfig
kubectl config use-context ci --kubeconfig=kubeconfig
chmod 600 kubeconfig

- name: Deploy ArgoCD Project
run: kubectl --kubeconfig kubeconfig apply -f argocd/project.yaml
# ArgoCD AppProject (argocd/project.yaml) is managed by cluster-services; the scoped CI token cannot apply AppProjects.

- name: Deploy Environment - ${{ matrix.environment }}
run: |
Expand DownExpand Up@@ -248,34 +308,34 @@
echo "Application did not become healthy in time."
exit 1
fi

- name: Check if CDN Sync is needed
id: check-sync-cdn
run: |
if [[ "${{ matrix.environment }}" == "qas" || "${{ matrix.environment }}" == "tst" || "${{ matrix.environment }}" == "stg" || "${{ matrix.environment }}" == "prd" ]]; then
echo "synccdn=true" >> $GITHUB_OUTPUT
else
echo "synccdn=false" >> $GITHUB_OUTPUT
fi
fi

# Sync-CDN:
# runs-on: ubuntu-latest
# needs: Deploy
# if: needs.Deploy.outputs.synccdn_needed == 'true'

# steps:
# - name: Checkout repository
# uses: actions/checkout@v3
# with:
# fetch-depth: 0 # Fetch all history for proper change detection

# - name: Install AWS CLI
# run: |
# curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
# unzip awscliv2.zip
# sudo ./aws/install
# aws --version

# - name: Sync to Wasabi S3 bucket
# env:
# AWS_ACCESS_KEY_ID: ${{ secrets.WASABI_ACCESS_KEY }}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); ci: keyless K8s creds via GitHub OIDC->Vault (retire KUBECONFIG_DEV/PROD) by mattmattox · Pull Request #76 · SupportTools/website · GitHub
Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 72 additions & 12 deletions .github/workflows/pipeline.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,6 +114,9 @@
Deploy-NonProd:
runs-on: self-hosted-linux
needs: Publish
permissions:
contents: read
id-token: write # required for GitHub OIDC -> Vault
strategy:
max-parallel: 1
matrix:
Expand All@@ -129,13 +132,40 @@
- name: Setup kubectl
uses: azure/setup-kubectl@v4

# Keyless: GitHub OIDC -> Vault jwt auth. exportToken makes VAULT_TOKEN available to the mint step.
- name: Vault login (GitHub OIDC)
uses: hashicorp/vault-action@v3
with:
url: https://vault.support.tools
method: jwt
path: github-actions # the jwt auth mount
role: gha-website
jwtGithubAudience: https://github.com/SupportTools # matches bound_audiences
exportToken: true # -> VAULT_TOKEN env for the next step

# Mint the short-lived (1h), namespace-scoped Kubernetes token and build a kubeconfig from it.
# The kubernetes secrets engine generates on WRITE (PUT + kubernetes_namespace), so it must be
# requested explicitly here. In-cluster runner => talk to a1-ops-prd's own apiserver + in-cluster CA.
- name: Setup Kubeconfig
env:
VAULT_ADDR: https://vault.support.tools
run: |
echo "${{ secrets.KUBECONFIG_DEV }}" | base64 -d > kubeconfig
KUBE_TOKEN=$(curl -sf -H "X-Vault-Token: ${VAULT_TOKEN}" \
-X PUT -d '{"kubernetes_namespace":"arc-runners-supporttools"}' \
"${VAULT_ADDR}/v1/kubernetes-onprem/creds/website" \
| jq -r '.data.service_account_token')
Comment on lines +153 to +156

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Grant create before keeping the bootstrap branch

This kubeconfig is now sourced from the Vault-issued least-privilege token, but the deploy script still treats a missing supporttools-${ENVIRONMENT} Application as recoverable by piping argocd/${ENVIRONMENT}.yaml into kubectl apply below. The new role is scoped for the existing get/patch path, so if one of the six Applications is deleted or a cluster is rebuilt, this branch now fails with an RBAC error instead of recreating it as the old kubeconfig did; the same pattern exists in Deploy-Prod. Either give the token create on those Applications or replace the branch with a clear precondition failure.

Useful? React with 👍 / 👎.

test -n "$KUBE_TOKEN" && test "$KUBE_TOKEN" != null || { echo "::error::failed to mint K8s token"; exit 1; }
echo "::add-mask::$KUBE_TOKEN"
kubectl config set-cluster onprem \
--server=https://kubernetes.default.svc:443 \
--certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
--embed-certs=true --kubeconfig=kubeconfig
kubectl config set-credentials ci --token="${KUBE_TOKEN}" --kubeconfig=kubeconfig
kubectl config set-context ci --cluster=onprem --user=ci --namespace=argocd --kubeconfig=kubeconfig
kubectl config use-context ci --kubeconfig=kubeconfig
chmod 600 kubeconfig

- name: Deploy ArgoCD Project
run: kubectl --kubeconfig kubeconfig apply -f argocd/project.yaml
# ArgoCD AppProject (argocd/project.yaml) is managed by cluster-services; the scoped CI token cannot apply AppProjects.

- name: Deploy Environment - ${{ matrix.environment }}
run: |
Expand DownExpand Up@@ -174,7 +204,7 @@
echo "Application did not become healthy in time."
exit 1
fi

- name: Check if CDN Sync is needed
id: check-sync-cdn
run: |
Expand All@@ -188,6 +218,9 @@
Deploy-Prod:
runs-on: self-hosted-linux
needs: Deploy-NonProd
permissions:
contents: read
id-token: write # required for GitHub OIDC -> Vault
strategy:
max-parallel: 1
matrix:
Expand All@@ -203,13 +236,40 @@
- name: Setup kubectl
uses: azure/setup-kubectl@v4

# Keyless: GitHub OIDC -> Vault jwt auth. exportToken makes VAULT_TOKEN available to the mint step.
- name: Vault login (GitHub OIDC)
uses: hashicorp/vault-action@v3
with:
url: https://vault.support.tools
method: jwt
path: github-actions # the jwt auth mount
role: gha-website
jwtGithubAudience: https://github.com/SupportTools # matches bound_audiences
exportToken: true # -> VAULT_TOKEN env for the next step

# Mint the short-lived (1h), namespace-scoped Kubernetes token and build a kubeconfig from it.
# The kubernetes secrets engine generates on WRITE (PUT + kubernetes_namespace), so it must be
# requested explicitly here. In-cluster runner => talk to a1-ops-prd's own apiserver + in-cluster CA.
- name: Setup Kubeconfig
env:
VAULT_ADDR: https://vault.support.tools
run: |
echo "${{ secrets.KUBECONFIG_PROD }}" | base64 -d > kubeconfig
KUBE_TOKEN=$(curl -sf -H "X-Vault-Token: ${VAULT_TOKEN}" \
-X PUT -d '{"kubernetes_namespace":"arc-runners-supporttools"}' \
"${VAULT_ADDR}/v1/kubernetes-onprem/creds/website" \
| jq -r '.data.service_account_token')
test -n "$KUBE_TOKEN" && test "$KUBE_TOKEN" != null || { echo "::error::failed to mint K8s token"; exit 1; }
echo "::add-mask::$KUBE_TOKEN"
kubectl config set-cluster onprem \
--server=https://kubernetes.default.svc:443 \
--certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
--embed-certs=true --kubeconfig=kubeconfig
kubectl config set-credentials ci --token="${KUBE_TOKEN}" --kubeconfig=kubeconfig
kubectl config set-context ci --cluster=onprem --user=ci --namespace=argocd --kubeconfig=kubeconfig
kubectl config use-context ci --kubeconfig=kubeconfig
chmod 600 kubeconfig

- name: Deploy ArgoCD Project
run: kubectl --kubeconfig kubeconfig apply -f argocd/project.yaml
# ArgoCD AppProject (argocd/project.yaml) is managed by cluster-services; the scoped CI token cannot apply AppProjects.

- name: Deploy Environment - ${{ matrix.environment }}
run: |
Expand DownExpand Up@@ -248,34 +308,34 @@
echo "Application did not become healthy in time."
exit 1
fi

- name: Check if CDN Sync is needed
id: check-sync-cdn
run: |
if [[ "${{ matrix.environment }}" == "qas" || "${{ matrix.environment }}" == "tst" || "${{ matrix.environment }}" == "stg" || "${{ matrix.environment }}" == "prd" ]]; then
echo "synccdn=true" >> $GITHUB_OUTPUT
else
echo "synccdn=false" >> $GITHUB_OUTPUT
fi
fi

# Sync-CDN:
# runs-on: ubuntu-latest
# needs: Deploy
# if: needs.Deploy.outputs.synccdn_needed == 'true'

# steps:
# - name: Checkout repository
# uses: actions/checkout@v3
# with:
# fetch-depth: 0 # Fetch all history for proper change detection

# - name: Install AWS CLI
# run: |
# curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
# unzip awscliv2.zip
# sudo ./aws/install
# aws --version

# - name: Sync to Wasabi S3 bucket
# env:
# AWS_ACCESS_KEY_ID: ${{ secrets.WASABI_ACCESS_KEY }}
Expand Down
Loading