diff --git a/config/fulcio-config.yaml b/config/fulcio-config.yaml index cbc2a6d41..dd17c9556 100644 --- a/config/fulcio-config.yaml +++ b/config/fulcio-config.yaml @@ -89,7 +89,7 @@ data: "IssuerURL": "https://token.actions.githubusercontent.com", "ClientID": "sigstore", "Type": "github-workflow", - "IsCiProvider": true + "IsCiProvider": false } }, "MetaIssuers": { @@ -116,7 +116,7 @@ data: "https://token.actions.githubusercontent.com/*": { "ClientID": "sigstore", "Type": "github-workflow", - "IsCiProvider": true + "IsCiProvider": false } } } diff --git a/federation/main.go b/federation/main.go index d7a51073c..0db04a6b0 100644 --- a/federation/main.go +++ b/federation/main.go @@ -139,6 +139,8 @@ func main() { fulcioConfig.OIDCIssuers[cfg.URL] = fulcioCfg } + // We have to start to set IsCiProvider as true as default + // after moving the ci providers to the config.yaml conf := readYaml() for providerType, provider := range conf.Providers { for _, issuer := range provider.OIDCIssuers { @@ -147,7 +149,7 @@ func main() { ClientID: "sigstore", Type: config.IssuerType(providerType), IssuerClaim: issuer.IssuerClaim, - IsCiProvider: true, + IsCiProvider: issuer.IsCiProvider, } fulcioConfig.OIDCIssuers[fulcioCfg.IssuerURL] = fulcioCfg } @@ -155,7 +157,7 @@ func main() { fulcioMetaCfg := config.OIDCIssuer{ ClientID: "sigstore", Type: config.IssuerType(providerType), - IsCiProvider: true, + IsCiProvider: issuer.IsCiProvider, } fulcioConfig.MetaIssuers[issuer.IssuerURL] = fulcioMetaCfg }