diff --git a/Dockerfile.ocp b/Dockerfile.ocp index 65bd2228ad0..57ff9b91083 100644 --- a/Dockerfile.ocp +++ b/Dockerfile.ocp @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS builder WORKDIR /go/src/github.com/openshift/api COPY . . ENV GO_PACKAGE github.com/openshift/api diff --git a/console/v1/tests/consoleplugins.console.openshift.io/AAA_ungated.yaml b/console/v1/tests/consoleplugins.console.openshift.io/AAA_ungated.yaml index c487d9215d3..868a9d289a5 100644 --- a/console/v1/tests/consoleplugins.console.openshift.io/AAA_ungated.yaml +++ b/console/v1/tests/consoleplugins.console.openshift.io/AAA_ungated.yaml @@ -4,7 +4,7 @@ crdName: consoleplugins.console.openshift.io version: v1 tests: onCreate: - - name: Should be able to create a minimal ConsolePlugin + - name: Should be able to cr eate a minimal ConsolePlugin initial: | apiVersion: console.openshift.io/v1 kind: ConsolePlugin diff --git a/features/features.go b/features/features.go index 73e90c07618..23dd0857a6c 100644 --- a/features/features.go +++ b/features/features.go @@ -9,7 +9,7 @@ import ( func FeatureSets(clusterProfile ClusterProfileName, featureSet configv1.FeatureSet) (*FeatureGateEnabledDisabled, error) { byFeatureSet, ok := allFeatureGates[clusterProfile] if !ok { - return nil, fmt.Errorf("no information found for ClusterProfile=%q", clusterProfile) + return nil, fmt.Errorf("no information found for ClusterProfile=%q", clusterProfile) } featureGates, ok := byFeatureSet[featureSet] if !ok { diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml index e9ab2c71f85..f2a8aabf126 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml @@ -8,6 +8,7 @@ "name": "cluster" }, "spec": {}, + "status": { "featureGates": [ {