-
Notifications
You must be signed in to change notification settings - Fork 321
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of https://github.com/hashicorp/consul-k8s into n…
…et-4343/api-gateway-peering-acceptance-test
- Loading branch information
Showing
21 changed files
with
331 additions
and
107 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
```release-note: | ||
```release-note:bug | ||
crd: fix bug on service intentions CRD causing some updates to be ignored. | ||
``` |
Large diffs are not rendered by default.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
# Dispatch to the consul-k8s-workflows with a weekly cron | ||
# | ||
# A separate file is needed for each release because the cron schedules are different for each release. | ||
name: weekly-acceptance-1-2-x | ||
on: | ||
schedule: | ||
# * is a special character in YAML so you have to quote this string | ||
# Run weekly on Wednesday at 3AM UTC/11PM EST/8PM PST | ||
# - cron: '0 3 * * 3' | ||
- cron: '0 0 * * *' # Temporarily nightly until 1.2.0 GA | ||
|
||
|
||
# these should be the only settings that you will ever need to change | ||
env: | ||
BRANCH: "release/1.2.x" | ||
CONTEXT: "weekly" | ||
|
||
jobs: | ||
cloud: | ||
name: cloud | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: benc-uk/workflow-dispatch@798e70c97009500150087d30d9f11c5444830385 # v1.2.2 | ||
name: cloud | ||
with: | ||
workflow: cloud.yml | ||
repo: hashicorp/consul-k8s-workflows | ||
ref: main | ||
token: ${{ secrets.ELEVATED_GITHUB_TOKEN }} | ||
inputs: '{ "context":"${{ env.CONTEXT }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ github.sha }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}" }' |
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
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
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
//go:build fips | ||
|
||
package version | ||
|
||
// This validates during compilation that we are being built with a FIPS enabled go toolchain | ||
import ( | ||
_ "crypto/tls/fipsonly" | ||
"runtime" | ||
"strings" | ||
) | ||
|
||
// IsFIPS returns true if consul-k8s is operating in FIPS-140-2 mode. | ||
func IsFIPS() bool { | ||
return true | ||
} | ||
|
||
func GetFIPSInfo() string { | ||
str := "Enabled" | ||
// Try to get the crypto module name | ||
gover := strings.Split(runtime.Version(), "X:") | ||
if len(gover) >= 2 { | ||
gover_last := gover[len(gover)-1] | ||
// Able to find crypto module name; add that to status string. | ||
str = "FIPS 140-2 Enabled, crypto module " + gover_last | ||
} | ||
return str | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
//go:build !fips | ||
|
||
package version | ||
|
||
// IsFIPS returns true if consul-k8s is operating in FIPS-140-2 mode. | ||
func IsFIPS() bool { | ||
return false | ||
} | ||
|
||
func GetFIPSInfo() string { | ||
return "" | ||
} |
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
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
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
Oops, something went wrong.