Skip to content

NE-1317: manifests - add ingress capability annotation #950

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

Merged
openshift-merge-bot merged 1 commit into from
Apr 19, 2024
Merged

NE-1317: manifests - add ingress capability annotation #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 manifests/00-cluster-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: openshift-ingress-operator
annotations:
capability.openshift.io/name: Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down
12 changes: 6 additions & 6 deletions manifests/00-ingress-credentials-request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: openshift-ingress
namespace: openshift-cloud-credential-operator
annotations:
capability.openshift.io/name: CloudCredential
capability.openshift.io/name: CloudCredential+Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down Expand Up @@ -38,7 +38,7 @@ metadata:
name: openshift-ingress-azure
namespace: openshift-cloud-credential-operator
annotations:
capability.openshift.io/name: CloudCredential
capability.openshift.io/name: CloudCredential+Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down Expand Up @@ -67,7 +67,7 @@ metadata:
name: openshift-ingress-gcp
namespace: openshift-cloud-credential-operator
annotations:
capability.openshift.io/name: CloudCredential
capability.openshift.io/name: CloudCredential+Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand All @@ -93,7 +93,7 @@ metadata:
name: openshift-ingress-ibmcloud
namespace: openshift-cloud-credential-operator
annotations:
capability.openshift.io/name: CloudCredential
capability.openshift.io/name: CloudCredential+Ingress
spec:
providerSpec:
apiVersion: cloudcredential.openshift.io/v1
Expand Down Expand Up @@ -123,7 +123,7 @@ metadata:
name: openshift-ingress-powervs
namespace: openshift-cloud-credential-operator
annotations:
capability.openshift.io/name: CloudCredential
capability.openshift.io/name: CloudCredential+Ingress
spec:
providerSpec:
apiVersion: cloudcredential.openshift.io/v1
Expand Down Expand Up @@ -153,7 +153,7 @@ metadata:
name: openshift-ingress-alibabacloud
namespace: openshift-ingress-operator
annotations:
capability.openshift.io/name: CloudCredential
capability.openshift.io/name: CloudCredential+Ingress
spec:
providerSpec:
apiVersion: cloudcredential.openshift.io/v1
Expand Down
1 change: 1 addition & 0 deletions manifests/00-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ kind: Namespace
apiVersion: v1
metadata:
annotations:
capability.openshift.io/name: Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_90_ingress-operator_00_prometheusrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: prometheus-k8s
namespace: openshift-ingress-operator
annotations:
capability.openshift.io/name: Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_90_ingress-operator_01_prometheusrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: prometheus-k8s
namespace: openshift-ingress-operator
annotations:
capability.openshift.io/name: Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_90_ingress-operator_02_servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: ingress-operator
namespace: openshift-ingress-operator
annotations:
capability.openshift.io/name: Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_90_ingress-operator_03_prometheusrules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
labels:
role: alert-rules
annotations:
capability.openshift.io/name: Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down
1 change: 1 addition & 0 deletions manifests/01-cluster-role-binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: openshift-ingress-operator
annotations:
capability.openshift.io/name: Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down
2 changes: 2 additions & 0 deletions manifests/01-role-binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
name: ingress-operator
namespace: openshift-ingress-operator
annotations:
capability.openshift.io/name: Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand All @@ -25,6 +26,7 @@ metadata:
name: ingress-operator
namespace: openshift-config
annotations:
capability.openshift.io/name: Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down
2 changes: 2 additions & 0 deletions manifests/01-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
name: ingress-operator
namespace: openshift-ingress-operator
annotations:
capability.openshift.io/name: Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down Expand Up @@ -45,6 +46,7 @@ metadata:
name: ingress-operator
namespace: openshift-config
annotations:
capability.openshift.io/name: Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down
1 change: 1 addition & 0 deletions manifests/01-service-account.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
name: ingress-operator
namespace: openshift-ingress-operator
annotations:
capability.openshift.io/name: Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
1 change: 1 addition & 0 deletions manifests/01-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
capability.openshift.io/name: Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down
1 change: 1 addition & 0 deletions manifests/01-trusted-ca-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
annotations:
capability.openshift.io/name: Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down
1 change: 1 addition & 0 deletions manifests/02-deployment-ibm-cloud-managed.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
capability.openshift.io/name: Ingress
config.openshift.io/inject-proxy: ingress-operator
include.release.openshift.io/ibm-cloud-managed: "true"
name: ingress-operator
Expand Down
1 change: 1 addition & 0 deletions manifests/02-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: ingress-operator
namespace: openshift-ingress-operator
annotations:
capability.openshift.io/name: Ingress
config.openshift.io/inject-proxy: ingress-operator
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down
1 change: 1 addition & 0 deletions manifests/03-cluster-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ kind: ClusterOperator
metadata:
name: ingress
annotations:
capability.openshift.io/name: Ingress
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down
1 change: 1 addition & 0 deletions profile-patches/ibm-cloud-managed/02-deployment.yaml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
- op: replace
path: /metadata/annotations
value:
capability.openshift.io/name: Ingress
config.openshift.io/inject-proxy: ingress-operator
include.release.openshift.io/ibm-cloud-managed: "true"
- op: replace
Expand Down