Skip to content

Commit

Permalink
Merge branch 'main' into kyverno-v1.12.5
Browse files Browse the repository at this point in the history
Signed-off-by: Brad Beck <bradley.beck@gmail.com>

# Conflicts:
#	platform/vendor/vendor.yaml
  • Loading branch information
bradbeck committed Sep 24, 2024
2 parents c487e36 + 35a521b commit f1d722f
Show file tree
Hide file tree
Showing 9 changed files with 630 additions and 159 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
name: SARIF file
path: results.sarif
retention-days: 5

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion platform/00-kubernetes-minikube-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -euo pipefail
# There are multiple ways to validate signatures, checksums, etc.

# PINNED VERSIONS GO HERE
MINIKUBE_VERSION=v1.30.1
MINIKUBE_VERSION=v1.33.1
MINIKUBE_FILE_NAME=minikube-linux-amd64
MINIKUBE_URL=https://github.com/kubernetes/minikube/releases/download/$MINIKUBE_VERSION/$MINIKUBE_FILE_NAME

Expand Down
2 changes: 2 additions & 0 deletions platform/10-tekton-pipelines-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ kubectl apply --filename "${GIT_ROOT}/platform/components/tekton/triggers/rbac.y
for deployment in tekton-pipelines-webhook tekton-pipelines-controller tekton-triggers-controller tekton-triggers-core-interceptors tekton-triggers-webhook; do
kubectl rollout status -n tekton-pipelines "deployment/${deployment}"
done

kubectl rollout status -n tekton-pipelines-resolvers deployment/tekton-pipelines-remote-resolvers
1 change: 1 addition & 0 deletions platform/31-kyverno-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ kubectl patch \
-n kyverno \
--type json --patch-file "${GIT_ROOT}"/platform/components/kyverno/patch_container_args.json
kubectl rollout status -n kyverno deployment/kyverno-admission-controller
sleep 10

echo -e "${C_GREEN}Creating verify-image admission control policy...${C_RESET_ALL}"
pushd "$GIT_ROOT"/resources/kyverno/admission-control-policy
Expand Down
65 changes: 61 additions & 4 deletions platform/vendor/tekton/chains/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ metadata:
app.kubernetes.io/instance: default
app.kubernetes.io/part-of: tekton-chains
pipeline.tekton.dev/release: "devel"
version: "v0.18.1"
version: "v0.21.1"
spec:
replicas: 1
selector:
Expand All @@ -85,12 +85,12 @@ spec:
app.kubernetes.io/part-of: tekton-chains
# # tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml
pipeline.tekton.dev/release: "devel"
version: "v0.18.1"
version: "v0.21.1"
spec:
serviceAccountName: tekton-chains-controller
containers:
- name: tekton-chains-controller
image: gcr.io/tekton-releases/github.com/tektoncd/chains/cmd/controller:v0.18.1@sha256:32925b5903606e2d544c1bfc940c53347b77566a4967214f4b3781c2260cc4ea
image: gcr.io/tekton-releases/github.com/tektoncd/chains/cmd/controller:v0.21.1@sha256:327709227dee2207013623532c62f2975b5bbea0de5d4042b4ba82d7ff1ccffd
volumeMounts:
- name: signing-secrets
mountPath: /etc/signing-secrets
Expand All @@ -105,11 +105,14 @@ spec:
value: tekton.dev/chains
- name: CONFIG_OBSERVABILITY_NAME
value: tekton-chains-config-observability
- name: CONFIG_LEADERELECTION_NAME
value: tekton-chains-config-leader-election
ports:
- name: metrics
containerPort: 9090
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
# User 65532 is the distroless nonroot user ID
runAsUser: 65532
runAsGroup: 65532
Expand Down Expand Up @@ -339,7 +342,61 @@ data:
# this ConfigMap such that even if we don't have access to
# other resources in the namespace, we can still access
# this ConfigMap.
version: "v0.18.1"
version: "v0.21.1"

---
# Copyright 2023 Tekton Authors LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

apiVersion: v1
kind: ConfigMap
metadata:
name: tekton-chains-config-leader-election
namespace: tekton-chains
labels:
app.kubernetes.io/instance: default
app.kubernetes.io/part-of: tekton-chains
data:
_example: |
################################
# #
# EXAMPLE CONFIGURATION #
# #
################################
# This block is not actually functional configuration,
# but serves to illustrate the available configuration
# options and document them in a way that is accessible
# to users that `kubectl edit` this config map.
#
# These sample configuration options may be copied out of
# this example block and unindented to be in the data block
# to actually change the configuration.
# lease-duration is how long non-leaders will wait to try to acquire the
# lock; 15 seconds is the value used by core kubernetes controllers.
lease-duration: "60s"
# renew-deadline is how long a leader will try to renew the lease before
# giving up; 10 seconds is the value used by core kubernetes controllers.
renew-deadline: "40s"
# retry-period is how long the leader election client waits between tries of
# actions; 2 seconds is the value used by core kubernetes controllers.
retry-period: "10s"
# buckets is the number of buckets used to partition key space of each
# Reconciler. If this number is M and the replica number of the controller
# is N, the N replicas will compete for the M buckets. The owner of a
# bucket will take care of the reconciling for the keys partitioned into
# that bucket.
buckets: "1"
---
# Copyright 2019 Tekton Authors LLC
Expand Down
Loading

0 comments on commit f1d722f

Please sign in to comment.