Skip to content
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
11 changes: 0 additions & 11 deletions .github/dependabot.yml

This file was deleted.

4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,16 @@ jobs:
runs-on: ubuntu-22.04
needs: [build, e2e-test]
if: ${{ github.ref_type == 'tag' }}
env:
preflight_version: 1.14.1 # renovate: datasource=github-releaser depName=preflight packageName=redhat-openshift-ecosystem/openshift-preflight
steps:
- name: Checkout Repository
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

- name: Certify Images
continue-on-error: false
run: |
curl -fsSL https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases/download/1.14.1/preflight-linux-amd64 --output preflight
curl -fsSL https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases/download/${{ env.preflight_version }}/preflight-linux-amd64 --output preflight
chmod +x preflight

IFS=',' read -ra arch_list <<< "${{ env.platforms }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/f5-cla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
remote-repository-name: "f5-cla-data"
path-to-signatures: "signatures/beta/signatures.json"
# Comma separated list of usernames for maintainers or any other individuals who should not be prompted for a CLA.
allowlist: bot*
allowlist: bot*,renovate
# Do not lock PRs after a merge.
lock-pullrequest-aftermerge: false
env:
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:1.18
FROM quay.io/operator-framework/helm-operator:v1.41.1

ENV HOME=/opt/helm
Expand Down
20 changes: 15 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,26 @@ endif

# Set the Operator SDK version to use. By default, what is installed on the system is used.
# This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
# renovate: datasource=github-releaser depName=operator-sdk packageName=operator-framework/operator-sdk
OPERATOR_SDK_VERSION ?= v1.40.0

# renovate: datasource=github-releaser depName=operator-registry packageName=operator-framework/operator-registry
OPM_VERSION ?= v1.28.0

# Set the Kustomize version to use. By default, what is installed on the system is used.
# This is useful for CI or a project to utilize a specific version of the kustomize toolkit.
# renovate: datasource=github-releaser depName=kustomize packageName=kubernetes-sigs/kustomize
KUSTOMIZE_VERSION ?= v5.0.1

# Image URL to use all building/pushing image targets
IMG ?= $(IMAGE_TAG_BASE):$(VERSION)

# kube-rbac-proxy image base
KRP_IMAGE_BASE ?= quay.io/brancz/kube-rbac-proxy

# kube-rbac-proxy image tag
KRP_IMAGE_TAG ?= v0.18.0
# renovate: datasource=docker depName=depName=quay.io/brancz/kube-rbac-proxy
KRP_IMAGE_VERSION ?= v0.18.0

# image pull secret name: eg regcred
IMAGE_PULL_SECRET_NAME ?=
Expand Down Expand Up @@ -134,7 +144,7 @@ uninstall: kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube
.PHONY: deploy
deploy: kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
cd config/default && $(KUSTOMIZE) edit set image kube-rbac-proxy=$(KRP_IMAGE_BASE):$(KRP_IMAGE_TAG)
cd config/default && $(KUSTOMIZE) edit set image kube-rbac-proxy=$(KRP_IMAGE_BASE):$(KRP_IMAGE_VERSION)
if [ -n "$(IMAGE_PULL_SECRET_NAME)" ]; then cd config/default && $(KUSTOMIZE) edit add patch --kind Deployment --group apps --version v1 --name controller-manager --patch '${image_pull_secrets_patch}'; fi
$(KUSTOMIZE) build config/default | kubectl apply -f -

Expand All @@ -153,7 +163,7 @@ ifeq (,$(shell which kustomize 2>/dev/null))
@{ \
set -e ;\
mkdir -p $(dir $(KUSTOMIZE)) ;\
curl -sSLo - https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v5.0.1/kustomize_v5.0.1_$(OS)_$(ARCH).tar.gz | \
curl -sSLo - https://github.com/kubernetes-sigs/kustomize/releases/download/$(KUSTOMIZE_VERSION)/kustomize_$(KUSTOMIZE_VERSION)_$(OS)_$(ARCH).tar.gz | \
tar xzf - -C bin/ ;\
}
else
Expand Down Expand Up @@ -198,7 +208,7 @@ bundle: kustomize operator-sdk ## Generate bundle manifests and metadata, then v
$(OPERATOR_SDK) generate kustomize manifests --interactive=false -q
cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
cd config/manifests/bases && $(KUSTOMIZE) edit set annotation containerImage:$(IMG)
cd config/default && $(KUSTOMIZE) edit set image kube-rbac-proxy=$(KRP_IMAGE_BASE):$(KRP_IMAGE_TAG)
cd config/default && $(KUSTOMIZE) edit set image kube-rbac-proxy=$(KRP_IMAGE_BASE):$(KRP_IMAGE_VERSION)
if [ -n "$(IMAGE_PULL_SECRET_NAME)" ]; then cd config/default && $(KUSTOMIZE) edit add patch --kind Deployment --group apps --version v1 --name controller-manager --patch '${image_pull_secrets_patch}'; fi
$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
@printf "%s\n" '' 'LABEL com.redhat.openshift.versions="$(OPENSHIFT_VERSION)"' 'LABEL com.redhat.delivery.operator.bundle=true' 'LABEL com.redhat.delivery.backport=true' >> bundle.Dockerfile
Expand All @@ -221,7 +231,7 @@ ifeq (,$(shell which opm 2>/dev/null))
@{ \
set -e ;\
mkdir -p $(dir $(OPM)) ;\
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.28.0/$(OS)-$(ARCH)-opm ;\
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/$(OPM_VERSION)/$(OS)-$(ARCH)-opm ;\
chmod +x $(OPM) ;\
}
else
Expand Down
1 change: 1 addition & 0 deletions bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=nginx-ingress-operator
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
# renovate: datasource=github-releaser depName=operator-sdk packageName=operator-framework/operator-sdk
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.40.0
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=helm.sdk.operatorframework.io/v1
Expand Down
39 changes: 39 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"github>nginx/k8s-common",
"schedule:daily"
],
"kubernetes": {
"managerFilePatterns": [
"/bundle/manifests/.+\\.yaml$/",
"/bundle/tests/scorecard/.+\\.yaml$/",
"/config/.+\\.yaml$/",
"/examples/.+\\.yaml$/",
"/helm-charts/nginx-ingress/crds/.+\\.yaml$/",
"/helm-charts/nginx-ingress/templates/.+\\.yaml$/"
]
},
"customManagers": [
{
"customType": "regex",
"description": "Update env variable version in Github Actions workflow",
"fileMatch": [
"/.github/workflows/.+\\.ya?ml$/"
],
"matchStrings": [
"\\s+.+?: (?<currentValue>.+?) # renovate: datasource=(?<datasource>[a-z-]+?) depName=(?<depName>.+?)(?: (?:packageName|lookupName)=(?<packageName>.+?))?(?: versioning=(?<versioning>[a-z-]+?))?\\s"
]
},
{
"customType": "regex",
"description": "Update Operator SDK version in bundle Dockerfile",
"fileMatch": [
"bundle\\.Dockerfile$"
],
"matchStrings": [
"# renovate: datasource=(?<datasource>[a-z-]+?) depName=(?<depName>.+?)(?: (?:packageName|lookupName)=(?<packageName>.+?))?(?: versioning=(?<versioning>[a-z-]+?))?\\sLABEL operators.operatorframework.io.metrics.builder=operator-sdk-(?<currentValue>.+?)\\s"
]
}
]
}