Skip to content
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/google/uuid v1.3.0
github.com/onsi/ginkgo/v2 v2.9.5
github.com/onsi/gomega v1.27.7
github.com/openshift/api v0.0.0-20230509100629-894b49f57a15
github.com/openshift/api v0.0.0-20230627091025-b88ff67980ac
github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb
github.com/openshift/library-go v0.0.0-20230508110756-9b7abe2c9cbf
github.com/operator-framework/operator-sdk v0.5.1-0.20190301204940-c2efe6f74e7b
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -631,8 +631,8 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU=
github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRahPmr4=
github.com/openshift/api v0.0.0-20230509100629-894b49f57a15 h1:0aKQixYOtjKB3NKhNzFeQ1t0oDOkacpaAN1ztfZufB8=
github.com/openshift/api v0.0.0-20230509100629-894b49f57a15/go.mod h1:4VWG+W22wrB4HfBL88P40DxLEpSOaiBVxUnfalfJo9k=
github.com/openshift/api v0.0.0-20230627091025-b88ff67980ac h1:bY6f6tb7ZUNb6Lfsm3r3SMwcDvbvGXjYV+caTnAjVRA=
github.com/openshift/api v0.0.0-20230627091025-b88ff67980ac/go.mod h1:4VWG+W22wrB4HfBL88P40DxLEpSOaiBVxUnfalfJo9k=
github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb h1:Nij5OnaECrkmcRQMAE9LMbQXPo95aqFnf+12B7SyFVI=
github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb/go.mod h1:Rhb3moCqeiTuGHAbXBOlwPubUMlOZEkrEWTRjIF3jzs=
github.com/openshift/library-go v0.0.0-20230508110756-9b7abe2c9cbf h1:ZpFAN2qprgp7jEhGPrOAwP8mmuYC9BRYzvDefg+k4GM=
Expand Down
11 changes: 11 additions & 0 deletions install/0000_30_machine-api-operator_00_credentials-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
name: openshift-machine-api-aws
namespace: openshift-cloud-credential-operator
annotations:
capability.openshift.io/name: MachineAPI
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
spec:
Expand Down Expand Up @@ -69,6 +70,7 @@ metadata:
name: openshift-machine-api-azure
namespace: openshift-cloud-credential-operator
annotations:
capability.openshift.io/name: MachineAPI
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
spec:
Expand All @@ -91,6 +93,7 @@ metadata:
name: openshift-machine-api-openstack
namespace: openshift-cloud-credential-operator
annotations:
capability.openshift.io/name: MachineAPI
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
spec:
Expand All @@ -109,6 +112,7 @@ metadata:
name: openshift-machine-api-gcp
namespace: openshift-cloud-credential-operator
annotations:
capability.openshift.io/name: MachineAPI
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
spec:
Expand All @@ -133,6 +137,7 @@ metadata:
name: openshift-machine-api-ovirt
namespace: openshift-cloud-credential-operator
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
spec:
secretRef:
Expand All @@ -150,6 +155,7 @@ metadata:
name: openshift-machine-api-vsphere
namespace: openshift-cloud-credential-operator
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
spec:
secretRef:
Expand All @@ -167,6 +173,7 @@ metadata:
name: openshift-machine-api-ibmcloud
namespace: openshift-cloud-credential-operator
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
spec:
providerSpec:
Expand Down Expand Up @@ -197,6 +204,7 @@ metadata:
name: openshift-machine-api-powervs
namespace: openshift-cloud-credential-operator
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
spec:
providerSpec:
Expand Down Expand Up @@ -224,6 +232,8 @@ kind: CredentialsRequest
metadata:
name: openshift-machine-api-alibabacloud
namespace: openshift-cloud-credential-operator
annotations:
capability.openshift.io/name: MachineAPI
spec:
providerSpec:
apiVersion: cloudcredential.openshift.io/v1
Expand Down Expand Up @@ -257,6 +267,7 @@ metadata:
name: openshift-machine-api-nutanix
namespace: openshift-cloud-credential-operator
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
spec:
secretRef:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: machine-api-operator-images
namespace: openshift-machine-api
annotations:
capability.openshift.io/name: MachineAPI
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
annotations:
capability.openshift.io/name: MachineAPI
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 install/0000_30_machine-api-operator_02_machine.crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
capability.openshift.io/name: MachineAPI
api-approved.openshift.io: https://github.com/openshift/api/pull/948
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
capability.openshift.io/name: MachineAPI
api-approved.openshift.io: https://github.com/openshift/api/pull/1032
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
capability.openshift.io/name: MachineAPI
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
labels:
k8s-app: machine-api-operator-machine-webhook
annotations:
capability.openshift.io/name: MachineAPI
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
labels:
k8s-app: machine-api-operator-webhook
annotations:
capability.openshift.io/name: MachineAPI
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down
20 changes: 20 additions & 0 deletions install/0000_30_machine-api-operator_09_rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: machine-api-operator
namespace: openshift-machine-api
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"

Expand All @@ -14,6 +15,7 @@ metadata:
name: machine-api-controllers
namespace: openshift-machine-api
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"

Expand All @@ -24,6 +26,7 @@ metadata:
name: machine-api-termination-handler
namespace: openshift-machine-api
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
automountServiceAccountToken: false
Expand All @@ -35,6 +38,7 @@ metadata:
name: machine-api-controllers
namespace: openshift-config
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
rules:
Expand All @@ -54,6 +58,7 @@ metadata:
name: machine-api-controllers
namespace: openshift-config-managed
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups:
Expand All @@ -72,6 +77,7 @@ metadata:
name: machine-api-controllers
namespace: openshift-machine-api
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
rules:
Expand Down Expand Up @@ -163,6 +169,7 @@ kind: ClusterRole
metadata:
name: machine-api-controllers
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
rules:
Expand Down Expand Up @@ -262,6 +269,7 @@ metadata:
name: machine-api-operator
namespace: openshift-machine-api
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
rules:
Expand Down Expand Up @@ -350,6 +358,7 @@ kind: ClusterRole
metadata:
name: machine-api-operator
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
rules:
Expand Down Expand Up @@ -418,6 +427,7 @@ kind: ClusterRole
metadata:
name: machine-api-operator-ext-remediation
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
aggregationRule:
Expand All @@ -433,6 +443,7 @@ kind: ClusterRoleBinding
metadata:
name: machine-api-operator-ext-remediation
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
roleRef:
Expand All @@ -450,6 +461,7 @@ kind: ClusterRoleBinding
metadata:
name: machine-api-controllers
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
roleRef:
Expand All @@ -468,6 +480,7 @@ metadata:
name: machine-api-controllers
namespace: openshift-machine-api
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
roleRef:
Expand All @@ -486,6 +499,7 @@ metadata:
name: machine-api-controllers
namespace: openshift-config
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
roleRef:
Expand All @@ -504,6 +518,7 @@ metadata:
name: machine-api-controllers
namespace: openshift-config-managed
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -520,6 +535,7 @@ kind: ClusterRoleBinding
metadata:
name: machine-api-operator
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
roleRef:
Expand All @@ -538,6 +554,7 @@ metadata:
name: machine-api-operator
namespace: openshift-machine-api
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
roleRef:
Expand All @@ -556,6 +573,7 @@ metadata:
name: prometheus-k8s-machine-api-operator
namespace: openshift-machine-api
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
roleRef:
Expand All @@ -575,6 +593,7 @@ metadata:
name: prometheus-k8s-machine-api-operator
namespace: openshift-machine-api
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
rules:
Expand Down Expand Up @@ -603,6 +622,7 @@ metadata:
labels:
rbac.authorization.k8s.io/aggregate-to-cluster-reader: "true"
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
rules:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: security.openshift.io/v1
kind: SecurityContextConstraints
metadata:
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
kubernetes.io/description: 'machine-api-termination-handler allows the
machine-api-termination-handler service account to run as root, access host
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: kube-rbac-proxy
namespace: openshift-machine-api
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
data:
Expand Down
2 changes: 2 additions & 0 deletions install/0000_30_machine-api-operator_10_service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
name: machine-api-operator
namespace: openshift-machine-api
annotations:
capability.openshift.io/name: MachineAPI
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand All @@ -27,6 +28,7 @@ metadata:
name: machine-api-controllers
namespace: openshift-machine-api
annotations:
capability.openshift.io/name: MachineAPI
exclude.release.openshift.io/internal-openshift-hosted: "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 install/0000_30_machine-api-operator_11_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
labels:
k8s-app: machine-api-operator
annotations:
capability.openshift.io/name: MachineAPI
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand All @@ -17,6 +18,7 @@ spec:
template:
metadata:
annotations:
capability.openshift.io/name: MachineAPI
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
kubectl.kubernetes.io/default-container: machine-api-operator
labels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: ClusterOperator
metadata:
name: machine-api
annotations:
capability.openshift.io/name: MachineAPI
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ metadata:
api: clusterapi
k8s-app: termination-handler
annotations:
capability.openshift.io/name: MachineAPI
include.release.openshift.io/self-managed-high-availability: "true"
exclude.release.openshift.io/internal-openshift-hosted: "true"
spec:
Expand Down
2 changes: 2 additions & 0 deletions install/0000_90_machine-api-operator_03_servicemonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
name: machine-api-operator
namespace: openshift-machine-api
annotations:
capability.openshift.io/name: MachineAPI
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down Expand Up @@ -33,6 +34,7 @@ metadata:
labels:
k8s-app: controller
annotations:
capability.openshift.io/name: MachineAPI
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
Expand Down
Loading