Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: bump Gatekeeper matrix #1186

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
strategy:
matrix:
KUBERNETES_VERSION: ["1.26.10", "1.27.7"]
GATEKEEPER_VERSION: ["3.11.0", "3.12.0", "3.13.0"]
GATEKEEPER_VERSION: ["3.12.0", "3.13.0", "3.14.0"]
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
strategy:
matrix:
KUBERNETES_VERSION: ["1.26.10", "1.27.7"]
GATEKEEPER_VERSION: ["3.11.0", "3.12.0", "3.13.0"]
GATEKEEPER_VERSION: ["3.12.0", "3.13.0", "3.14.0"]
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ image:
```

Deploy using one of the following deployments.
Note: Ratify is compatible with Gatkeeper >= 3.11.0. Server auth is required to be enabled.
Note: Ratify is compatible with Gatekeeper >= 3.12.0. Server auth is required to be enabled.

**Option 1**
Client auth disabled and server auth enabled using self signed certificate
Expand Down
14 changes: 4 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ LDFLAGS += -X $(GO_PKG)/internal/version.GitTag=$(GIT_TAG)
KIND_VERSION ?= 0.14.0
KUBERNETES_VERSION ?= 1.27.7
KIND_KUBERNETES_VERSION ?= 1.27.3
GATEKEEPER_VERSION ?= 3.13.0
GATEKEEPER_VERSION ?= 3.14.0
DAPR_VERSION ?= 1.11.1
COSIGN_VERSION ?= 1.13.1
NOTATION_VERSION ?= 1.0.0-rc.7
Expand Down Expand Up @@ -431,16 +431,10 @@ e2e-azure-setup: e2e-create-all-image e2e-notation-setup e2e-notation-leaf-cert-

e2e-deploy-gatekeeper: e2e-helm-install
./.staging/helm/linux-amd64/helm repo add gatekeeper https://open-policy-agent.github.io/gatekeeper/charts
./.staging/helm/linux-amd64/helm install gatekeeper/gatekeeper \
--version ${GATEKEEPER_VERSION} \
--name-template=gatekeeper \
--namespace ${GATEKEEPER_NAMESPACE} --create-namespace \
--set enableExternalData=true \
--set validatingWebhookTimeoutSeconds=5 \
--set mutatingWebhookTimeoutSeconds=2 \
--set auditInterval=0

if [ ${GATEKEEPER_VERSION} = "3.12.0" ] || [ ${GATEKEEPER_VERSION} = "3.13.0" ]; then ./.staging/helm/linux-amd64/helm install gatekeeper/gatekeeper --version ${GATEKEEPER_VERSION} --name-template=gatekeeper --namespace ${GATEKEEPER_NAMESPACE} --create-namespace --set enableExternalData=true --set validatingWebhookTimeoutSeconds=5 --set mutatingWebhookTimeoutSeconds=2 --set auditInterval=0; fi
if [ ${GATEKEEPER_VERSION} = "3.13.0" ]; then kubectl -n ${GATEKEEPER_NAMESPACE} patch deployment gatekeeper-controller-manager --type=json -p='[{"op": "add", "path": "/spec/template/spec/containers/0/args/-", "value": "--external-data-provider-response-cache-ttl=1s"}]' && sleep 60; fi
# Gatekeeper versions >= 3.14.0 need a special helm value to override the default external data response cache ttl to 10s
if [ ${GATEKEEPER_VERSION} != "3.12.0" ] && [ ${GATEKEEPER_VERSION} != "3.13.0" ]; then ./.staging/helm/linux-amd64/helm install gatekeeper/gatekeeper --version ${GATEKEEPER_VERSION} --name-template=gatekeeper --namespace ${GATEKEEPER_NAMESPACE} --create-namespace --set enableExternalData=true --set validatingWebhookTimeoutSeconds=5 --set mutatingWebhookTimeoutSeconds=2 --set auditInterval=0 --set externaldataProviderResponseCacheTTL=1s; fi

e2e-build-crd-image:
docker build --progress=plain --no-cache --build-arg KUBE_VERSION=${KUBERNETES_VERSION} --build-arg TARGETOS="linux" --build-arg TARGETARCH="amd64" -f crd.Dockerfile -t localbuildcrd:test ./charts/ratify/crds
Expand Down
2 changes: 1 addition & 1 deletion charts/ratify/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ $ helm upgrade -n gatekeeper-system [RELEASE_NAME] ratify/ratify
| resources.requests.memory | Memory request of Ratify Deployment | `512Mi` |
| serviceAccount.create | Create new dedicated Ratify service account | `true` |
| serviceAccount.name | Name of Ratify service account to create | `ratify-admin` |
| gatekeeper.version | Determines the Gatekeeper CRD versioning | `3.13.0` |
| gatekeeper.version | Determines the Gatekeeper CRD versioning | `3.14.0` |
| gatekeeper.namespace | Namespace Gatekeeper is installed | `gatekeeper-system` |
| instrumentation.metricsEnabled | Initializes the configured metrics provider | `true` |
| instrumentation.metricsType | Specifies the metrics provider type | `prometheus` |
Expand Down
2 changes: 1 addition & 1 deletion charts/ratify/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ serviceAccount:
create: true
name: ratify-admin
gatekeeper:
version: "3.13.0"
version: "3.14.0"
namespace: # default is gatekeeper-system
instrumentation:
metricsEnabled: true
Expand Down
4 changes: 3 additions & 1 deletion dev.helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ releases:
namespace: gatekeeper-system
createNamespace: true
chart: gatekeeper/gatekeeper
version: 3.13.0
version: 3.14.0
wait: true
set:
- name: enableExternalData
Expand All @@ -18,6 +18,8 @@ releases:
value: 5
- name: mutatingWebhookTimeoutSeconds
value: 2
- name: externaldataProviderResponseCacheTTL
value: 10s
- name: ratify
namespace: gatekeeper-system
chart: charts/ratify # PRERELEASE: Change to 'ratify/ratify' before copying to helmfile.yaml
Expand Down
2 changes: 1 addition & 1 deletion scripts/azure-ci-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export KEYVAULT_NAME="${KEYVAULT_NAME:-ratify-akv-${SUFFIX}}"
export USER_ASSIGNED_IDENTITY_NAME="${USER_ASSIGNED_IDENTITY_NAME:-ratify-e2e-identity-${SUFFIX}}"
export LOCATION="eastus"
export KUBERNETES_VERSION=${1:-1.27.7}
GATEKEEPER_VERSION=${2:-3.11.0}
GATEKEEPER_VERSION=${2:-3.14.0}
TENANT_ID=$3
export RATIFY_NAMESPACE=${4:-gatekeeper-system}
CERT_DIR=${5:-"~/ratify/certs"}
Expand Down