Skip to content

Commit 3d93d32

Browse files
ciarams87ciarams87
committed
Update to latest OCP version
1 parent f4996d2 commit 3d93d32

File tree

8 files changed

+56
-36
lines changed

8 files changed

+56
-36
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.redhat.io/openshift4/ose-helm-operator:v4.9
1+
FROM registry.redhat.io/openshift4/ose-helm-operator:v4.10
22

33
ARG VERSION
44

‎Makefile‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,21 @@ IMAGE_TAG_BASE ?= nginx/nginx-ingress-operator
3636
# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
3737
BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION)
3838

39+
# BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command
40+
BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
41+
42+
# USE_IMAGE_DIGESTS defines if images are resolved via tags or digests
43+
# You can enable this value if you would like to use SHA Based Digests
44+
# To enable set flag to true
45+
USE_IMAGE_DIGESTS ?= false
46+
ifeq ($(USE_IMAGE_DIGESTS), true)
47+
BUNDLE_GEN_FLAGS += --use-image-digests
48+
endif
49+
3950
# Image URL to use all building/pushing image targets
4051
IMG ?= $(IMAGE_TAG_BASE):$(VERSION)
4152

53+
.PHONY: all
4254
all: docker-build
4355

4456
##@ General
@@ -54,37 +66,45 @@ all: docker-build
5466
# More info on the awk command:
5567
# http://linuxcommand.org/lc3_adv_awk.php
5668

69+
.PHONY: help
5770
help: ## Display this help.
5871
@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
5972

6073
##@ Build
6174

75+
.PHONY: run
6276
run: helm-operator ## Run against the configured Kubernetes cluster in ~/.kube/config
6377
$(HELM_OPERATOR) run
6478

79+
.PHONY: docker-build
6580
docker-build: ## Build docker image with the manager.
66-
docker build -t ${IMG} . --build-arg VERSION=${VERSION}
81+
docker build -t ${IMG} .
6782

83+
.PHONY: docker-push
6884
docker-push: ## Push docker image with the manager.
6985
docker push ${IMG}
7086

7187
##@ Deployment
7288

89+
.PHONY: install
7390
install: kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
7491
$(KUSTOMIZE) build config/crd | kubectl apply -f -
7592

93+
.PHONY: uninstall
7694
uninstall: kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config.
7795
$(KUSTOMIZE) build config/crd | kubectl delete -f -
7896

97+
.PHONY: deploy
7998
deploy: kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
8099
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
81100
$(KUSTOMIZE) build config/default | kubectl apply -f -
82101

102+
.PHONY: undeploy
83103
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
84104
$(KUSTOMIZE) build config/default | kubectl delete -f -
85105

86106
OS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
87-
ARCH := $(shell uname -m | sed 's/x86_64/amd64/')
107+
ARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')
88108

89109
.PHONY: kustomize
90110
KUSTOMIZE = $(shell pwd)/bin/kustomize
@@ -110,7 +130,7 @@ ifeq (,$(shell which helm-operator 2>/dev/null))
110130
@{ \
111131
set -e ;\
112132
mkdir -p $(dir $(HELM_OPERATOR)) ;\
113-
curl -sSLo $(HELM_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.10.1/helm-operator_$(OS)_$(ARCH) ;\
133+
curl -sSLo $(HELM_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.16.0/helm-operator_$(OS)_$(ARCH) ;\
114134
chmod +x $(HELM_OPERATOR) ;\
115135
}
116136
else
@@ -141,7 +161,7 @@ ifeq (,$(shell which opm 2>/dev/null))
141161
@{ \
142162
set -e ;\
143163
mkdir -p $(dir $(OPM)) ;\
144-
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.15.1/$(OS)-$(ARCH)-opm ;\
164+
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.19.1/$(OS)-$(ARCH)-opm ;\
145165
chmod +x $(OPM) ;\
146166
}
147167
else
@@ -172,8 +192,3 @@ catalog-build: opm ## Build a catalog image.
172192
.PHONY: catalog-push
173193
catalog-push: ## Push a catalog image.
174194
$(MAKE) docker-push IMG=$(CATALOG_IMG)
175-
176-
# Get medatada to prepare the bundle to be submitted at https://github.com/redhat-openshift-ecosystem/certified-operators/
177-
.PHONY: get-metadata-certification
178-
get-metadata-certification:
179-
@./hack/get_image_info.sh ${IMAGE_TAG_BASE} ${VERSION}

‎config/default/manager_auth_proxy_patch.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
spec:
1111
containers:
1212
- name: kube-rbac-proxy
13-
image: registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.9
13+
image: registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.10
1414
args:
1515
- "--secure-listen-address=0.0.0.0:8443"
1616
- "--upstream=http://127.0.0.1:8080/"

‎config/manager/kustomization.yaml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ generatorOptions:
55
disableNameSuffixHash: true
66

77
configMapGenerator:
8-
- files:
8+
- name: manager-config
9+
files:
910
- controller_manager_config.yaml
10-
name: manager-config
11-
apiVersion: kustomize.config.k8s.io/v1beta1
12-
kind: Kustomization
13-
images:
14-
- name: controller
15-
newName: registry.connect.redhat.com/nginx/nginx-ingress-operator
16-
newTag: 1.0.0

‎config/manager/manager.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ spec:
1919
replicas: 1
2020
template:
2121
metadata:
22+
annotations:
23+
kubectl.kubernetes.io/default-container: manager
2224
labels:
2325
control-plane: controller-manager
2426
spec:
@@ -44,5 +46,14 @@ spec:
4446
port: 8081
4547
initialDelaySeconds: 5
4648
periodSeconds: 10
49+
# TODO(user): Configure the resources accordingly based on the project requirements.
50+
# More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
51+
resources:
52+
limits:
53+
cpu: 500m
54+
memory: 128Mi
55+
requests:
56+
cpu: 10m
57+
memory: 64Mi
4758
serviceAccountName: controller-manager
4859
terminationGracePeriodSeconds: 10

‎config/scorecard/patches/basic.config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
entrypoint:
55
- scorecard-test
66
- basic-check-spec
7-
image: quay.io/operator-framework/scorecard-test:v1.10.1
7+
image: quay.io/operator-framework/scorecard-test:v1.16.0
88
labels:
99
suite: basic
1010
test: basic-check-spec-test

‎config/scorecard/patches/olm.config.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
entrypoint:
55
- scorecard-test
66
- olm-bundle-validation
7-
image: quay.io/operator-framework/scorecard-test:v1.10.1
7+
image: quay.io/operator-framework/scorecard-test:v1.16.0
88
labels:
99
suite: olm
1010
test: olm-bundle-validation-test
@@ -14,7 +14,7 @@
1414
entrypoint:
1515
- scorecard-test
1616
- olm-crds-have-validation
17-
image: quay.io/operator-framework/scorecard-test:v1.10.1
17+
image: quay.io/operator-framework/scorecard-test:v1.16.0
1818
labels:
1919
suite: olm
2020
test: olm-crds-have-validation-test
@@ -24,7 +24,7 @@
2424
entrypoint:
2525
- scorecard-test
2626
- olm-crds-have-resources
27-
image: quay.io/operator-framework/scorecard-test:v1.10.1
27+
image: quay.io/operator-framework/scorecard-test:v1.16.0
2828
labels:
2929
suite: olm
3030
test: olm-crds-have-resources-test
@@ -34,7 +34,7 @@
3434
entrypoint:
3535
- scorecard-test
3636
- olm-spec-descriptors
37-
image: quay.io/operator-framework/scorecard-test:v1.10.1
37+
image: quay.io/operator-framework/scorecard-test:v1.16.0
3838
labels:
3939
suite: olm
4040
test: olm-spec-descriptors-test
@@ -44,7 +44,7 @@
4444
entrypoint:
4545
- scorecard-test
4646
- olm-status-descriptors
47-
image: quay.io/operator-framework/scorecard-test:v1.10.1
47+
image: quay.io/operator-framework/scorecard-test:v1.16.0
4848
labels:
4949
suite: olm
5050
test: olm-status-descriptors-test

‎helm-charts/nginx-ingress/Chart.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
name: nginx-ingress
2-
version: 0.13.0
3-
appVersion: 2.2.0
41
apiVersion: v1
5-
kubeVersion: ">= 1.19.0-0"
2+
appVersion: 2.2.0
63
description: NGINX Ingress Controller
7-
icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v2.2.0/deployments/helm-chart/chart-icon.png
84
home: https://github.com/nginxinc/kubernetes-ingress
9-
sources:
10-
- https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.0/deployments/helm-chart
5+
icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v2.2.0/deployments/helm-chart/chart-icon.png
116
keywords:
12-
- ingress
13-
- nginx
7+
- ingress
8+
- nginx
9+
kubeVersion: '>= 1.19.0-0'
1410
maintainers:
15-
- name: nginxinc
16-
email: [email protected]
11+
- email: [email protected]
12+
name: nginxinc
13+
name: nginx-ingress
14+
sources:
15+
- https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.0/deployments/helm-chart
16+
version: 0.13.0

0 commit comments

Comments
 (0)