Skip to content
This repository has been archived by the owner on Jun 12, 2023. It is now read-only.

Commit

Permalink
Merge pull request #156 from vatsalparekh/remove-node-labeller
Browse files Browse the repository at this point in the history
Removed node-labeller from ssp-operator
  • Loading branch information
ksimon1 authored May 21, 2020
2 parents 66a9cb0 + e0af35e commit 3b306ff
Show file tree
Hide file tree
Showing 31 changed files with 579 additions and 795 deletions.
1 change: 0 additions & 1 deletion _defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#
# Any version, or default, should not be set more than once in a place in the source tree.

kubevirt_node_labeller_tag: "{{ lookup('env','NODE_LABELLER_TAG')| default('v0.1.1', true) }}"
kvm_info_nfd_plugin_tag: "{{ lookup('env','KVM_INFO_TAG')| default('v0.5.8', true) }}"
kubevirt_cpu_nfd_plugin_tag: "{{ lookup('env','CPU_PLUGIN_TAG')| default('v0.1.1', true) }}"
virt_launcher_tag: "{{ lookup('env','VIRT_LAUNCHER_TAG')| default('v0.21.0', true) }}"
Expand Down
23 changes: 23 additions & 0 deletions cluster/latest/kubevirt-ssp-operator-cr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
apiVersion: ssp.kubevirt.io/v1
kind: KubevirtCommonTemplatesBundle
metadata:
name: kubevirt-common-template-bundle
spec:
version: v0.7.0
---
apiVersion: ssp.kubevirt.io/v1
kind: KubevirtMetricsAggregation
metadata:
name: kubevirt-metrics-aggregation
spec:
version: v0.0.1
---
apiVersion: ssp.kubevirt.io/v1
kind: KubevirtTemplateValidator
metadata:
name: kubevirt-template-validator
namespace: kubevirt
spec:
version: v0.6.2
templateValidatorReplicas: 2
51 changes: 51 additions & 0 deletions cluster/latest/kubevirt-ssp-operator-crd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: kubevirtcommontemplatesbundles.ssp.kubevirt.io
spec:
group: ssp.kubevirt.io
names:
kind: KubevirtCommonTemplatesBundle
listKind: KubevirtCommonTemplatesBundleList
plural: kubevirtcommontemplatesbundles
singular: kubevirtcommontemplatesbundle
scope: Namespaced
version: v1
subresources:
status: {}

---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: kubevirtmetricsaggregations.ssp.kubevirt.io
spec:
group: ssp.kubevirt.io
names:
kind: KubevirtMetricsAggregation
listKind: KubevirtMetricsAggregationList
plural: kubevirtmetricsaggregations
singular: kubevirtmetricsaggregation
scope: Namespaced
version: v1
subresources:
status: {}

---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: kubevirttemplatevalidators.ssp.kubevirt.io
spec:
group: ssp.kubevirt.io
names:
kind: KubevirtTemplateValidator
listKind: KubevirtTemplateValidatorList
plural: kubevirttemplatevalidators
singular: kubevirttemplatevalidator
scope: Namespaced
version: v1
subresources:
status: {}

197 changes: 197 additions & 0 deletions cluster/latest/kubevirt-ssp-operator.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: kubevirt-ssp-operator
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: kubevirt-ssp-operator
rules:
- apiGroups:
- kubevirt.io
- ssp.kubevirt.io
- template.openshift.io
resources:
- '*'
verbs:
- create
- get
- list
- patch
- update
- watch
- apiGroups:
- monitoring.coreos.com
resources:
- prometheusrules
verbs:
- create
- get
- list
- patch
- watch
- apiGroups:
- monitoring.coreos.com
resources:
- servicemonitors
verbs:
- get
- create
- apiGroups:
- rbac.authorization.k8s.io
resources:
- clusterroles
verbs:
- create
- list
- watch
- patch
- apiGroups:
- rbac.authorization.k8s.io
resources:
- clusterrolebindings
verbs:
- create
- get
- list
- watch
- patch
- apiGroups:
- extensions
- apps
resources:
- deployments
- deployments/finalizers
- replicasets
- daemonsets
verbs:
- create
- update
- get
- list
- patch
- watch
- apiGroups:
- ""
resources:
- serviceaccounts
- configmaps
- services
- services/finalizers
verbs:
- create
- update
- get
- patch
- list
- watch
- apiGroups:
- ""
resources:
- nodes
verbs:
- get
- patch
- update
- apiGroups:
- ""
resources:
- pods
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
- namespaces
verbs:
- get
- list
- watch
- apiGroups:
- admissionregistration.k8s.io
resources:
- validatingwebhookconfigurations
verbs:
- create
- get
- list
- patch
- watch
- apiGroups:
- security.openshift.io
resources:
- securitycontextconstraints
verbs:
- 'use'
resourceNames:
- privileged
---
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: kubevirt-ssp-operator
subjects:
- kind: ServiceAccount
name: kubevirt-ssp-operator
namespace: kubevirt
roleRef:
kind: ClusterRole
name: kubevirt-ssp-operator
apiGroup: rbac.authorization.k8s.io
---
# WARNING! this manifest is not meant for direct consumption.
# you are supposed to deploy the operator either
# - through the HyperConverged Operator
# - using the released manifests, see github
# - using hack/install-operator.sh
apiVersion: apps/v1
kind: Deployment
metadata:
name: kubevirt-ssp-operator
spec:
replicas: 1
selector:
matchLabels:
name: kubevirt-ssp-operator
template:
metadata:
labels:
name: kubevirt-ssp-operator
spec:
serviceAccountName: kubevirt-ssp-operator
strategy:
type: Recreate
containers:
- name: kubevirt-ssp-operator
image: quay.io/fromani/kubevirt-ssp-operator-container:latest
ports:
- containerPort: 60000
name: metrics
imagePullPolicy: Always
env:
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: IMAGE_REFERENCE
value: quay.io/fromani/kubevirt-ssp-operator-container:latest
- name: WATCH_NAMESPACE
value: ""
- name: KVM_INFO_TAG
value: ""
- name: VALIDATOR_TAG
value: ""
- name: VIRT_LAUNCHER_TAG
value: ""
- name: NODE_LABELLER_TAG
value: ""
- name: CPU_PLUGIN_TAG
value: ""
- name: IMAGE_NAME_PREFIX
value: ""
- name: OPERATOR_NAME
value: "kubevirt-ssp-operator"
6 changes: 0 additions & 6 deletions deploy/crds/kubevirt_v1_nodelabellerbundle_cr.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions deploy/crds/kubevirt_v1_nodelabellerbundle_crd.yaml

This file was deleted.

43 changes: 0 additions & 43 deletions functests/06-test-deploy-node-labeller.sh

This file was deleted.

1 change: 0 additions & 1 deletion hack/install-operator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ NAMESPACE=${1:-kubevirt}
source ${BASEPATH}/_common.sh

oc create -f ${BASEPATH}/../deploy/crds/kubevirt_v1_commontemplatesbundle_crd.yaml
oc create -f ${BASEPATH}/../deploy/crds/kubevirt_v1_nodelabellerbundle_crd.yaml
oc create -f ${BASEPATH}/../deploy/crds/kubevirt_v1_templatevalidator_crd.yaml
oc create -f ${BASEPATH}/../deploy/crds/kubevirt_v1_metricsaggregation_crd.yaml

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: operators.coreos.com/v1alpha1
kind: ClusterServiceVersion
metadata:
annotations:
alm-examples: '[{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtTemplateValidator","metadata":{"name":"kubevirt-template-validator","namespace":"kubevirt"},"spec":{"templateValidatorReplicas":2,"version":"v0.6.2"}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtCommonTemplatesBundle","metadata":{"name":"kubevirt-common-template-bundle"},"spec":{"version":"v0.7.0"}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtMetricsAggregation","metadata":{"name":"kubevirt-metrics-aggregation"},"spec":{"version":"v0.0.1"}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtNodeLabellerBundle","metadata":{"name":"kubevirt-node-labeller-bundle"},"spec":{"version":"v0.1.1"}}]'
alm-examples: '[{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtCommonTemplatesBundle","metadata":{"name":"kubevirt-common-template-bundle"},"spec":{"version":"v0.7.0"}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtMetricsAggregation","metadata":{"name":"kubevirt-metrics-aggregation"},"spec":{"version":"v0.0.1"}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtTemplateValidator","metadata":{"name":"kubevirt-template-validator","namespace":"kubevirt"},"spec":{"templateValidatorReplicas":2,"version":"v0.6.2"}}]'
capabilities: Basic Install
categories: Openshift Optional
containerImage: REPLACE_IMAGE
Expand Down Expand Up @@ -35,17 +35,6 @@ spec:
x-descriptors:
- urn:alm:descriptor:io.kubernetes.ssp:version
version: v1
- description: Represents a deployment of Node labeller component
displayName: KubeVirt Node labeller
kind: KubevirtNodeLabellerBundle
name: kubevirtnodelabellerbundles.ssp.kubevirt.io
specDescriptors:
- description: The version of the node labeller to deploy
displayName: Version
path: version
x-descriptors:
- urn:alm:descriptor:io.kubernetes.ssp:version
version: v1
- description: Represents a deployment of admission control webhook to validate
the KubeVirt templates
displayName: KubeVirt Template Validator admission webhook
Expand Down
Loading

0 comments on commit 3b306ff

Please sign in to comment.