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.

Sign up for GitHub

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

Jump to bottom

Update Authorino manifests - AuthConfig v1beta3 #219

Merged
merged 3 commits into from
Oct 18, 2024
Merged

Update Authorino manifests - AuthConfig v1beta3 #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5aaaaa9
Update Authorino manifests - AuthConfig v1beta3
guicassolato Oct 18, 2024
98206b0
disable installation of cert-manager
guicassolato Oct 18, 2024
f59f14c
disable verification of the authorino-webhooks image correctly set in…
guicassolato Oct 18, 2024
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
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ install-operator: manifests kustomize ## Install CRDs into the K8s cluster speci
uninstall-operator: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config.
kubectl delete -f $(OPERATOR_MANIFESTS) --ignore-not-found

install-authorino: $(KUSTOMIZE) create-namespace install-cert-manager ## install RBAC and CRD for authorino
install-authorino: $(KUSTOMIZE) create-namespace ## install RBAC and CRD for authorino
$(KUSTOMIZE) build config/authorino | kubectl apply -f -

uninstall-authorino: $(KUSTOMIZE) ## uninstall RBAC and CRD for authorino
Expand Down Expand Up @@ -357,7 +357,7 @@ verify-manifests: manifests $(YQ) ## Verify manifests update.
git diff -I'^ createdAt:' -I' containerImage:' -I' image:' --exit-code -- ./config ':(exclude)config/authorino/kustomization.yaml'
[ -z "$$(git ls-files --other --exclude-standard --directory --no-empty-directory ./config)" ]
$(YQ) ea -e 'select([.][].kind == "Deployment") | select([.][].metadata.name == "authorino-operator").spec.template.spec.containers[0].image | . == "$(OPERATOR_IMAGE)"' config/deploy/manifests.yaml
$(YQ) ea -e 'select([.][].kind == "Deployment") | select([.][].metadata.name == "authorino-webhooks").spec.template.spec.containers[0].image | . == "$(DEFAULT_AUTHORINO_IMAGE)"' config/deploy/manifests.yaml
# $(YQ) ea -e 'select([.][].kind == "Deployment") | select([.][].metadata.name == "authorino-webhooks").spec.template.spec.containers[0].image | . == "$(DEFAULT_AUTHORINO_IMAGE)"' config/deploy/manifests.yaml
$(YQ) e -e '.metadata.annotations.containerImage == "$(OPERATOR_IMAGE)"' config/manifests/bases/authorino-operator.clusterserviceversion.yaml

.PHONY: verify-bundle
Expand All @@ -366,7 +366,7 @@ verify-bundle: bundle $(YQ) ## Verify bundle update.
[ -z "$$(git ls-files --other --exclude-standard --directory --no-empty-directory ./bundle)" ]
$(YQ) e -e '.metadata.annotations.containerImage == "$(OPERATOR_IMAGE)"' $(BUNDLE_CSV)
$(YQ) e -e '.spec.install.spec.deployments[0].spec.template.spec.containers[0].image == "$(OPERATOR_IMAGE)"' $(BUNDLE_CSV)
$(YQ) e -e '.spec.install.spec.deployments[1].spec.template.spec.containers[0].image == "$(DEFAULT_AUTHORINO_IMAGE)"' $(BUNDLE_CSV)
# $(YQ) e -e '.spec.install.spec.deployments[1].spec.template.spec.containers[0].image == "$(DEFAULT_AUTHORINO_IMAGE)"' $(BUNDLE_CSV)

.PHONY: verify-fmt
verify-fmt: fmt ## Verify fmt update.
Expand Down
121 changes: 14 additions & 107 deletions bundle/manifests/authorino-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,14 @@ metadata:
alm-examples: |-
[
{
"apiVersion": "authorino.kuadrant.io/v1beta1",
"apiVersion": "authorino.kuadrant.io/v1beta2",
"kind": "AuthConfig",
"metadata": {
"name": "my-api-protection"
},
"spec": {
"hosts": [
"my-api.io"
],
"identity": [
{
"authentication": {
"api-key-users": {
"apiKey": {
"selector": {
"matchLabels": {
Expand All @@ -24,16 +21,19 @@ metadata:
}
},
"credentials": {
"in": "authorization_header",
"keySelector": "APIKEY"
},
"name": "api-key-users"
"authorizationHeader": {
"prefix": "APIKEY"
}
}
}
},
"hosts": [
"my-api.io"
]
}
},
{
"apiVersion": "authorino.kuadrant.io/v1beta2",
"apiVersion": "authorino.kuadrant.io/v1beta3",
"kind": "AuthConfig",
"metadata": {
"name": "my-api-protection"
Expand Down Expand Up @@ -83,7 +83,7 @@ metadata:
capabilities: Basic Install
categories: Integration & Delivery
containerImage: quay.io/kuadrant/authorino-operator:latest
createdAt: "2024-09-30T15:29:42Z"
createdAt: "2024-10-18T08:42:13Z"
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 All @@ -104,12 +104,12 @@ spec:
displayName: AuthConfig
kind: AuthConfig
name: authconfigs.authorino.kuadrant.io
version: v1beta1
version: v1beta2
- description: API to describe the desired protection for a service
displayName: AuthConfig
kind: AuthConfig
name: authconfigs.authorino.kuadrant.io
version: v1beta2
version: v1beta3
- description: API to create instances of authorino
displayName: Authorino
kind: Authorino
Expand Down Expand Up @@ -356,45 +356,6 @@ spec:
runAsNonRoot: true
serviceAccountName: authorino-operator
terminationGracePeriodSeconds: 10
- label:
app: authorino
authorino-component: authorino-webhooks
name: authorino-webhooks
spec:
selector:
matchLabels:
app: authorino
authorino-component: authorino-webhooks
strategy: {}
template:
metadata:
labels:
app: authorino
authorino-component: authorino-webhooks
spec:
containers:
- command:
- authorino
- webhooks
image: quay.io/kuadrant/authorino:latest
name: webhooks
ports:
- containerPort: 9443
name: webhooks
- containerPort: 8080
name: metrics
- containerPort: 8081
name: healthz
resources: {}
volumeMounts:
- mountPath: /tmp/k8s-webhook-server/serving-certs
name: cert
readOnly: true
volumes:
- name: cert
secret:
defaultMode: 420
secretName: authorino-webhook-server-cert
permissions:
- rules:
- apiGroups:
Expand Down Expand Up @@ -429,47 +390,6 @@ spec:
- create
- patch
serviceAccountName: authorino-operator
- rules:
- apiGroups:
- authorino.kuadrant.io
resources:
- authconfigs
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- authorino.kuadrant.io
resources:
- authconfigs/status
verbs:
- get
- patch
- update
- apiGroups:
- coordination.k8s.io
resources:
- leases
verbs:
- create
- get
- list
- update
- apiGroups:
- ""
resources:
- configmaps
- events
verbs:
- create
- get
- list
- update
serviceAccountName: default
strategy: deployment
installModes:
- supported: false
Expand Down Expand Up @@ -503,16 +423,3 @@ spec:
provider:
name: Red Hat
version: 0.0.0
webhookdefinitions:
- admissionReviewVersions:
- v1beta1
- v1beta2
containerPort: 443
conversionCRDs:
- authconfigs.authorino.kuadrant.io
deploymentName: authorino-webhooks
generateName: cauthconfigs.kb.io
sideEffects: None
targetPort: 9443
type: ConversionWebhook
webhookPath: /convert
Loading
Loading