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

prepare-release: fill RELATED_IMAGE_AUTHORINO #230

Merged
merged 2 commits into from
Nov 19, 2024
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
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ bundle: export IMAGE_TAG := $(IMAGE_TAG)
bundle: export BUNDLE_VERSION := $(BUNDLE_VERSION)
bundle: manifests kustomize operator-sdk $(YQ) ## Generate bundle manifests and metadata, then validate generated files.
$(OPERATOR_SDK) generate kustomize manifests -q
V="$(ACTUAL_DEFAULT_AUTHORINO_IMAGE)" $(YQ) eval '(select(.kind == "Deployment").spec.template.spec.containers[].env[] | select(.name == "RELATED_IMAGE_AUTHORINO").value) = strenv(V)' -i config/manager/manager.yaml
cd config/manager && $(KUSTOMIZE) edit set image controller=$(OPERATOR_IMAGE)
envsubst \
< config/manifests/bases/authorino-operator.clusterserviceversion.template.yaml \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ metadata:
capabilities: Basic Install
categories: Integration & Delivery
containerImage: quay.io/kuadrant/authorino-operator:latest
createdAt: "2024-11-14T11:17:40Z"
createdAt: "2024-11-19T15:52:57Z"
operators.operatorframework.io/builder: operator-sdk-v1.32.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/Kuadrant/authorino-operator
Expand Down
159 changes: 159 additions & 0 deletions bundle/manifests/authorino.kuadrant.io_authconfigs.yaml

Large diffs are not rendered by default.

159 changes: 159 additions & 0 deletions charts/authorino-operator/templates/manifests.yaml

Large diffs are not rendered by default.

159 changes: 159 additions & 0 deletions config/deploy/manifests.yaml

Large diffs are not rendered by default.

78 changes: 39 additions & 39 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,44 +18,44 @@ spec:
securityContext:
runAsNonRoot: true
containers:
- command:
- /manager
env:
- name: RELATED_IMAGE_AUTHORINO
value: quay.io/kuadrant/authorino:latest
args:
- --leader-elect
image: controller:latest
name: manager
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
readOnlyRootFilesystem: true
seccompProfile:
type: RuntimeDefault
ports:
- name: metrics
containerPort: 8080
livenessProbe:
httpGet:
path: /healthz
port: 8081
initialDelaySeconds: 15
periodSeconds: 20
readinessProbe:
httpGet:
path: /readyz
port: 8081
initialDelaySeconds: 5
periodSeconds: 10
resources:
limits:
cpu: 200m
memory: 300Mi
requests:
cpu: 200m
memory: 200Mi
- command:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is expected as now yq is formatting the manager.yaml

- /manager
env:
- name: RELATED_IMAGE_AUTHORINO
value: quay.io/kuadrant/authorino:latest
args:
- --leader-elect
image: controller:latest
name: manager
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
readOnlyRootFilesystem: true
seccompProfile:
type: RuntimeDefault
ports:
- name: metrics
containerPort: 8080
livenessProbe:
httpGet:
path: /healthz
port: 8081
initialDelaySeconds: 15
periodSeconds: 20
readinessProbe:
httpGet:
path: /readyz
port: 8081
initialDelaySeconds: 5
periodSeconds: 10
resources:
limits:
cpu: 200m
memory: 300Mi
requests:
cpu: 200m
memory: 200Mi
serviceAccountName: authorino-operator
terminationGracePeriodSeconds: 10
2 changes: 2 additions & 0 deletions make/helm.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

.PHONY: helm-build
helm-build: $(YQ) kustomize manifests ## Build the helm chart from kustomize manifests
# Set desired authorino image
V="$(ACTUAL_DEFAULT_AUTHORINO_IMAGE)" $(YQ) eval '(select(.kind == "Deployment").spec.template.spec.containers[].env[] | select(.name == "RELATED_IMAGE_AUTHORINO").value) = strenv(V)' -i config/manager/manager.yaml
# Replace the controller image
cd config/helm && $(KUSTOMIZE) edit set namespace "{{ .Release.Namespace }}"
cd config/authorino/webhook && $(KUSTOMIZE) edit set namespace "{{ .Release.Namespace }}"
Expand Down
Loading