Skip to content

Commit e5b0fbc

Browse files
Merge pull request #39 from derekwaynecarr/fix-related-objects
Fixup cluster operator resource
2 parents 4f7f32e + bfa8d88 commit e5b0fbc

File tree

43 files changed

+1981
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1981
-121
lines changed

Gopkg.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

manifests/04-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
fieldRef:
3939
fieldPath: metadata.name
4040
- name: OPERATOR_NAME
41-
value: "cluster-node-tuning"
41+
value: "node-tuning"
4242
- name: RESYNC_PERIOD
4343
value: "600"
4444
- name: CLUSTER_NODE_TUNED_IMAGE

manifests/05-clusteroperator.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: config.openshift.io/v1
2+
kind: ClusterOperator
3+
metadata:
4+
name: node-tuning
5+
spec: {}

pkg/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
const (
1111
nodeTunedImageDefault string = "registry.svc.ci.openshift.org/openshift/origin-v4.0:cluster-node-tuned"
12-
operatorNameDefault string = "cluster-node-tuning"
12+
operatorNameDefault string = "node-tuning"
1313
operatorNamespaceDefault string = "openshift-cluster-node-tuning-operator"
1414
resyncPeriodDefault int64 = 600
1515
)

pkg/controller/tuned/status.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ func (r *ReconcileTuned) syncOperatorStatus() (bool, error) {
3636
oldConditions := coState.Status.Conditions
3737
coState.Status.Conditions, requeue = computeStatusConditions(oldConditions, daemonset)
3838
operatorv1helpers.SetOperandVersion(&coState.Status.Versions, configv1.OperandVersion{Name: ntoconfig.OperatorName(), Version: version.Version})
39+
coState.Status.RelatedObjects = []configv1.ObjectReference{
40+
{
41+
Group: "",
42+
Resource: "namespaces",
43+
Name: dsManifest.Namespace,
44+
},
45+
}
3946

4047
if clusteroperator.ConditionsEqual(oldConditions, coState.Status.Conditions) {
4148
return requeue, nil

vendor/github.com/openshift/api/config/v1/register.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/config/v1/types.go

Lines changed: 21 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/config/v1/types_registries.go

Lines changed: 42 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go

Lines changed: 127 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go

Lines changed: 42 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)