Skip to content

bug 1871890: add current profile annotations to CVO manifests #325

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
deads2k wants to merge 1 commit into from
Closed

bug 1871890: add current profile annotations to CVO manifests #325

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
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ require (
github.com/ghodss/yaml v1.0.0
github.com/go-bindata/go-bindata v3.1.2+incompatible
github.com/kubernetes-sigs/kube-storage-version-migrator v0.0.0-20191127225502-51849bc15f17
github.com/openshift/api v0.0.0-20200723134351-89de68875e7c
github.com/openshift/api v0.0.0-20200824145854-a7f2798b4b7c
github.com/openshift/apiserver-library-go v0.0.0-20200521171520-a7bc13e3e650
github.com/openshift/build-machinery-go v0.0.0-20200713135615-1f43d26dccc7
github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7
github.com/openshift/client-go v0.0.0-20200722173614-5a1b0aaeff15
github.com/openshift/library-go v0.0.0-20200804191358-a2f5b6a8ef01
github.com/spf13/cobra v1.0.0
Expand Down
4 changes: 4 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,11 +519,15 @@ github.com/openshift/api v0.0.0-20200521101457-60c476765272/go.mod h1:TkhafijfTi
github.com/openshift/api v0.0.0-20200722170803-0ba2c3658da6/go.mod h1:IXsT3F4NjLtRzfnQvwU+g/oPWpoNsVV5vd5aaOMO8eU=
github.com/openshift/api v0.0.0-20200723134351-89de68875e7c h1:qsj/GaQ1sdT584yIcGmqqRpR5xtX5jTw5Gis3/09YI4=
github.com/openshift/api v0.0.0-20200723134351-89de68875e7c/go.mod h1:IXsT3F4NjLtRzfnQvwU+g/oPWpoNsVV5vd5aaOMO8eU=
github.com/openshift/api v0.0.0-20200824145854-a7f2798b4b7c h1:MdfKPcaE5iWhp3739duBzl0IQJmf3PxnB53iolKOti4=
github.com/openshift/api v0.0.0-20200824145854-a7f2798b4b7c/go.mod h1:VxlbNnMs63PHurw9hgy1DKQKWmTmhRf3PULl7KwA5Kg=
github.com/openshift/apiserver-library-go v0.0.0-20200521171520-a7bc13e3e650 h1:afTZdGoHK/IIKAb+xWjyQBywzMhjqTiFS6TDL/qNKr8=
github.com/openshift/apiserver-library-go v0.0.0-20200521171520-a7bc13e3e650/go.mod h1:4qVbQcC5cIehdpihkag4nVcp6blzsAYK7RzhBqgy24Y=
github.com/openshift/build-machinery-go v0.0.0-20200424080330-082bf86082cc/go.mod h1:1CkcsT3aVebzRBzVTSbiKSkJMsC/CASqxesfqEMfJEc=
github.com/openshift/build-machinery-go v0.0.0-20200713135615-1f43d26dccc7 h1:iP7TOaN+tEVNUQ0ODEbN1ukjLz918lsIt7Czf8giWlM=
github.com/openshift/build-machinery-go v0.0.0-20200713135615-1f43d26dccc7/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7 h1:mOq7Mg1Q9d7nIDxe1SJ6pluMBQsbVxa6olyAGmfYWTg=
github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/client-go v0.0.0-20200521150516-05eb9880269c h1:l7CmbzzkyWl4Y6qHmy6m4FvbH4iLnIXGrXqOfE5IFNA=
github.com/openshift/client-go v0.0.0-20200521150516-05eb9880269c/go.mod h1:kCMeo6IE4o4qvnepM9lgHQ4j/ZFfvY/N/2G/jpJdwm4=
github.com/openshift/client-go v0.0.0-20200722173614-5a1b0aaeff15 h1:b2QkHrmaYtY6kzy2VrYLc+KBmCuTpJjgvBahPqpt6V0=
Expand Down
8 changes: 8 additions & 0 deletions manifests/0000_90_cluster-authentication-operator_01_prometheusrbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ kind: Role
metadata:
name: prometheus-k8s
namespace: openshift-authentication-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups:
- ""
Expand All @@ -22,6 +24,8 @@ kind: Role
metadata:
name: prometheus-k8s
namespace: openshift-authentication
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups:
- ""
Expand All @@ -40,6 +44,8 @@ kind: RoleBinding
metadata:
name: prometheus-k8s
namespace: openshift-authentication-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
Expand All @@ -55,6 +61,8 @@ kind: RoleBinding
metadata:
name: prometheus-k8s
namespace: openshift-authentication
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
Expand Down
4 changes: 4 additions & 0 deletions manifests/0000_90_cluster-authentication-operator_02_servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ kind: ServiceMonitor
metadata:
name: authentication-operator
namespace: openshift-authentication-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
spec:
endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
Expand All @@ -30,6 +32,8 @@ kind: ServiceMonitor
metadata:
name: oauth-openshift
namespace: openshift-authentication
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
spec:
endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
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 @@ -3,6 +3,7 @@ kind: Namespace
metadata:
name: openshift-authentication-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
openshift.io/node-selector: ""
labels:
openshift.io/cluster-monitoring: "true"
1 change: 1 addition & 0 deletions manifests/02_config.cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: Authentication
metadata:
name: cluster
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
spec:
managementState: Managed
1 change: 1 addition & 0 deletions manifests/02_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
service.alpha.openshift.io/serving-cert-secret-name: serving-cert
labels:
app: authentication-operator
Expand Down
2 changes: 2 additions & 0 deletions manifests/03_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ kind: ConfigMap
metadata:
namespace: openshift-authentication-operator
name: authentication-operator-config
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
data:
operator-config.yaml: |
apiVersion: operator.openshift.io/v1alpha1
Expand Down
1 change: 1 addition & 0 deletions manifests/03_openshift_service_ca.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ metadata:
name: service-ca-bundle
namespace: openshift-authentication-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
service.beta.openshift.io/inject-cabundle: "true"
data: {}
1 change: 1 addition & 0 deletions manifests/03_operator_trusted_ca.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
namespace: openshift-authentication-operator
name: trusted-ca-bundle
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
labels:
config.openshift.io/inject-trusted-cabundle: "true"
2 changes: 2 additions & 0 deletions manifests/04_roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: system:openshift:operator:authentication
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
roleRef:
kind: ClusterRole
name: cluster-admin # TODO fix, this is madness
Expand Down
2 changes: 2 additions & 0 deletions manifests/05_serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@ kind: ServiceAccount
metadata:
namespace: openshift-authentication-operator
name: authentication-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
labels:
app: authentication-operator
1 change: 1 addition & 0 deletions manifests/07_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
labels:
app: authentication-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
config.openshift.io/inject-proxy: operator
exclude.release.openshift.io/internal-openshift-hosted: "true"
spec:
Expand Down
1 change: 1 addition & 0 deletions manifests/08_clusteroperator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: ClusterOperator
metadata:
name: authentication
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
exclude.release.openshift.io/internal-openshift-hosted: "true"
status:
versions:
Expand Down
4 changes: 3 additions & 1 deletion vendor/github.com/openshift/api/Makefile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 12 additions & 1 deletion vendor/github.com/openshift/api/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions ...t/api/authorization/v1/0000_03_authorization-openshift_01_rolebindingrestriction.crd.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/openshift/api/build/v1/generated.proto
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/openshift/api/build/v1/types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/openshift/api/build/v1/zz_generated.swagger_doc_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions ....com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 30 additions & 26 deletions ...b.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_proxy.crd.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading