Skip to content

manifests/00-ingress-credentials-request: Fill in cluster-profile annotations #692

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

Closed
wking wants to merge 4 commits into from
Closed

manifests/00-ingress-credentials-request: Fill in cluster-profile annotations #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbcf019
manifests/00-ingress-credentials-request: Fill in cluster-profile ann…
wking Dec 21, 2021
71c14e9
manifests/00-ingress-credentials-request: Drop ibm-cloud-managed
wking Dec 21, 2021
0dd22b3
manifests: Drop single-node-developer
wking Dec 22, 2021
7e66b3b
pkg/manifests: Update bindata
wking Dec 22, 2021
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: 0 additions & 1 deletion manifests/00-cluster-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ metadata:
annotations:
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"
rules:
- apiGroups:
- ""
Expand Down
16 changes: 8 additions & 8 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,9 +6,7 @@ metadata:
name: openshift-ingress
namespace: openshift-cloud-credential-operator
annotations:
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"
spec:
serviceAccountNames:
- ingress-operator
Expand All @@ -35,9 +33,7 @@ metadata:
name: openshift-ingress-azure
namespace: openshift-cloud-credential-operator
annotations:
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"
spec:
secretRef:
name: cloud-credentials
Expand All @@ -56,9 +52,7 @@ metadata:
name: openshift-ingress-gcp
namespace: openshift-cloud-credential-operator
annotations:
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"
spec:
serviceAccountNames:
- ingress-operator
Expand All @@ -76,6 +70,8 @@ kind: CredentialsRequest
metadata:
name: openshift-ingress-ibmcloud
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
spec:
providerSpec:
apiVersion: cloudcredential.openshift.io/v1
Expand All @@ -97,6 +93,8 @@ kind: CredentialsRequest
metadata:
name: openshift-ingress-powervs
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
spec:
providerSpec:
apiVersion: cloudcredential.openshift.io/v1
Expand All @@ -117,7 +115,9 @@ apiVersion: cloudcredential.openshift.io/v1
kind: CredentialsRequest
metadata:
name: openshift-ingress-alibabacloud
namespace: openshift-ingress-operator
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
Copy link
Member Author

@wking wking Dec 22, 2021

Choose a reason for hiding this comment

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

Talking this over with @joelddiaz , we probably want to keep these out of this profile, to make it more clear to cluster admins that the cloud-cred operator will completely ignore CredentialsRequests on these platforms, regardless of whether it's configured for manual or mint or whatever mode.

Copy link
Contributor

@joelddiaz joelddiaz Dec 22, 2021

Choose a reason for hiding this comment

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

this does imply we should do this for ALL CredentialsRequests for platforms that are only supported in "Manual" mode...

spec:
providerSpec:
apiVersion: cloudcredential.openshift.io/v1
Expand All @@ -140,4 +140,4 @@ spec:
effect: Allow
secretRef:
name: cloud-credentials
namespace: openshift-ingress-operator
namespace: openshift-ingress-operator
1 change: 0 additions & 1 deletion manifests/00-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ metadata:
annotations:
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"
openshift.io/node-selector: ""
workload.openshift.io/allowed: "management"
labels:
Expand Down
1 change: 0 additions & 1 deletion 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 @@ -6,7 +6,6 @@ metadata:
annotations:
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"
rules:
- apiGroups:
- ""
Expand Down
1 change: 0 additions & 1 deletion 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 @@ -6,7 +6,6 @@ metadata:
annotations:
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"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
Expand Down
1 change: 0 additions & 1 deletion 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 @@ -6,7 +6,6 @@ metadata:
annotations:
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"
spec:
endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
Expand Down
1 change: 0 additions & 1 deletion 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 @@ -8,7 +8,6 @@ metadata:
annotations:
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"
spec:
groups:
- name: openshift-ingress.rules
Expand Down
1 change: 0 additions & 1 deletion manifests/01-cluster-role-binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ metadata:
annotations:
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"
subjects:
- kind: ServiceAccount
name: ingress-operator
Expand Down
2 changes: 0 additions & 2 deletions manifests/01-role-binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ metadata:
annotations:
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"
subjects:
- kind: ServiceAccount
name: ingress-operator
Expand All @@ -27,7 +26,6 @@ metadata:
annotations:
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"
subjects:
- kind: ServiceAccount
name: ingress-operator
Expand Down
2 changes: 0 additions & 2 deletions manifests/01-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ metadata:
annotations:
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"
rules:
- apiGroups:
- operator.openshift.io
Expand Down Expand Up @@ -47,7 +46,6 @@ metadata:
annotations:
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"
rules:
- apiGroups:
- rbac.authorization.k8s.io
Expand Down
1 change: 0 additions & 1 deletion manifests/01-service-account.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ metadata:
annotations:
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: 0 additions & 1 deletion manifests/01-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ metadata:
annotations:
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"
service.beta.openshift.io/serving-cert-secret-name: metrics-tls
labels:
name: ingress-operator
Expand Down
1 change: 0 additions & 1 deletion manifests/01-trusted-ca-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ metadata:
annotations:
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"
release.openshift.io/create-only: "true"
labels:
config.openshift.io/inject-trusted-cabundle: "true"
Expand Down
1 change: 0 additions & 1 deletion manifests/02-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ metadata:
annotations:
config.openshift.io/inject-proxy: ingress-operator
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
spec:
replicas: 1
strategy:
Expand Down
1 change: 0 additions & 1 deletion manifests/03-cluster-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ metadata:
annotations:
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"
status:
versions:
- name: operator
Expand Down
Loading