Skip to content

Commit

Permalink
Remove the cluster-local block by default. (#224)
Browse files Browse the repository at this point in the history
This causes problems when it is deployed to a cluster that doesn't use this as its OIDC endpoint.

I have changed the e2e tests to specifically use this config instead.

Signed-off-by: Matt Moore <mattomata@gmail.com>
  • Loading branch information
mattmoor authored Oct 28, 2021
1 parent cbb6558 commit 18c1737
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 23 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/verify-k8s.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,26 @@ jobs:
--clusterrole=system:service-account-issuer-discovery \
--group=system:unauthenticated
# Overwrite the configuration to be what we need for KinD.
cat <<EOF > config/fulcio-config.yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: fulcio-config
namespace: fulcio-dev
data:
config.json: |-
{
"OIDCIssuers": {
"https://kubernetes.default.svc": {
"IssuerURL": "https://kubernetes.default.svc",
"ClientID": "sigstore",
"Type": "kubernetes"
}
}
}
EOF
kubectl create ns fulcio-dev
ko apply -Bf config/
Expand Down
5 changes: 0 additions & 5 deletions config/fulcio-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ data:
"ClientID": "sigstore",
"Type": "email"
},
"https://kubernetes.default.svc": {
"IssuerURL": "https://kubernetes.default.svc",
"ClientID": "sigstore",
"Type": "kubernetes"
},
"https://oauth2.sigstore.dev/auth": {
"IssuerURL": "https://oauth2.sigstore.dev/auth",
"ClientID": "sigstore",
Expand Down
18 changes: 0 additions & 18 deletions federation/kubernetes.default.svc/config.yaml

This file was deleted.

0 comments on commit 18c1737

Please sign in to comment.