Skip to content

Commit

Permalink
Merge branch 'main' into patch-5
Browse files Browse the repository at this point in the history
  • Loading branch information
StackScribe authored Jun 1, 2023
2 parents 2abda27 + 02ce860 commit a5c3db5
Show file tree
Hide file tree
Showing 204 changed files with 7,774 additions and 4,584 deletions.
2 changes: 1 addition & 1 deletion .github/.kubescape/controls-inputs.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"*.ghcr.io",
".*azurecr.io",
"docker.io",
"ghcr.keptn.sh"
"ghcr.io"
],
"max_critical_vulnerabilities": [
"5"
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/deploy-klt-on-cluster/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ runs:
run: |
echo "Installing KLT using manifests"
sed -i 's/imagePullPolicy: Always/imagePullPolicy: Never/g' ~/download/artifacts/lifecycle-operator-manifest-test/release.yaml
sed -i 's/ghcr.keptn.sh\/keptn\/functions-runtime:.*/localhost:5000\/keptn\/functions-runtime:${{ inputs.functions_runtime_tag }}/g' \
sed -i 's/ghcr.io\/keptn\/functions-runtime:.*/localhost:5000\/keptn\/functions-runtime:${{ inputs.functions_runtime_tag }}/g' \
~/download/artifacts/lifecycle-operator-manifest-test/release.yaml
kubectl create namespace keptn-lifecycle-toolkit-system
kubectl apply -f ~/download/artifacts/lifecycle-operator-manifest-test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
env:
GO_VERSION: "~1.20"
# renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools
CONTROLLER_TOOLS_VERSION: "v0.11.4"
CONTROLLER_TOOLS_VERSION: "v0.12.0"
ENVTEST_K8S_VERSION: "1.24.2"
SCHEDULER_COMPATIBLE_K8S_VERSION: "v0.24.3"
defaults:
Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:

- name: Generate helm charts
env:
RELEASE_REGISTRY: ghcr.keptn.sh/keptn
RELEASE_REGISTRY: ghcr.io/keptn
run: make helm-package

- name: Copy charts from klt to helm repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/helm-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
env:
GO_VERSION: "~1.20"
# renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools
CONTROLLER_TOOLS_VERSION: "v0.11.4"
CONTROLLER_TOOLS_VERSION: "v0.12.0"
ENVTEST_K8S_VERSION: "1.24.2"
SCHEDULER_COMPATIBLE_K8S_VERSION: "v0.24.3"
defaults:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ defaults:
env:
GO_VERSION: "~1.20"
# renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools
CONTROLLER_TOOLS_VERSION: "v0.11.4"
CONTROLLER_TOOLS_VERSION: "v0.12.0"
SCHEDULER_COMPATIBLE_K8S_VERSION: "v0.24.3"

jobs:
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up Cosign
uses: sigstore/[email protected].2
uses: sigstore/[email protected].5

- name: Build Docker Image
id: docker_build_image
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
${{ env.IMAGE_NAME }}@${{ env.IMAGE_DIGEST }}
- name: Generate SBOM
uses: anchore/[email protected].1
uses: anchore/[email protected].2
with:
image: ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
artifact-name: sbom-${{ matrix.config.name }}
Expand Down Expand Up @@ -162,7 +162,7 @@ jobs:

- name: Create manifests
env:
RELEASE_REGISTRY: ghcr.keptn.sh/keptn
RELEASE_REGISTRY: ghcr.io/keptn
CHART_APPVERSION: ${{ needs.release-please.outputs.tag_name }}
run: |
cd scheduler
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security-scans.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:

- name: KICS Scan
if: matrix.tool == 'kics'
uses: Checkmarx/kics-github-action@v1.6.3
uses: Checkmarx/kics-github-action@v1.7.0
with:
path: scans
config_path: .github/kics-config.yml
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/validate-helm-chart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- name: Generate helm charts
env:
RELEASE_REGISTRY: ghcr.keptn.sh/keptn
RELEASE_REGISTRY: ghcr.io/keptn
run: make helm-package

- name: Install readme generator
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:

- name: Generate helm charts
env:
RELEASE_REGISTRY: ghcr.keptn.sh/keptn
RELEASE_REGISTRY: ghcr.io/keptn
run: make helm-package

- name: Compare YAML file changes
Expand All @@ -81,7 +81,7 @@ jobs:
echo "There are no changes in the manifests"
else
echo ""
echo "Helm charts were not re-generated. Please regenerate them using make helm-package RELEASE_REGISTRY=ghcr.keptn.sh/keptn"
echo "Helm charts were not re-generated. Please regenerate them using make helm-package RELEASE_REGISTRY=ghcr.io/keptn"
echo ""
echo "=========== Diff ==========="
git diff
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Image URL to use all building/pushing image targets

# renovate: datasource=github-tags depName=kubernetes-sigs/kustomize
KUSTOMIZE_VERSION?=v5.0.1
KUSTOMIZE_VERSION?=v5.0.3
# renovate: datasource=github-tags depName=helm/helm
HELM_VERSION ?= v3.11.3
HELM_VERSION ?= v3.12.0
CHART_APPVERSION ?= v0.7.1 # x-release-please-version

# renovate: datasource=docker depName=cytopia/yamllint
Expand Down
1 change: 1 addition & 0 deletions docs/.htmltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ IgnoreDirs:
IgnoreURLs:
- "linkedin.com"
- "localhost"
- "twitter.com"
StripQueryString: false
127 changes: 0 additions & 127 deletions docs/content/en/docs/concepts/apps/_index.md

This file was deleted.

41 changes: 0 additions & 41 deletions docs/content/en/docs/concepts/evaluations/_index.md

This file was deleted.

Loading

0 comments on commit a5c3db5

Please sign in to comment.