From c127de7bd6b69a21478a2ec0483d60e9e76aa6be Mon Sep 17 00:00:00 2001 From: redhat-chai-bot Date: Thu, 9 Jul 2026 02:11:11 +0000 Subject: [PATCH] Revert "Merge pull request #1398 from jhadvig/fix-console-plugin-manifests" This reverts commit 46ba644262441e8de4f7b8a998d9290353146fe8, reversing changes made to 78fc02cc8bf08236031d0388a599b09f0c51f102. --- ...er-update-console-plugin_10_namespace.yaml | 16 ---- ...date-console-plugin_15_serviceaccount.yaml | 11 --- ...pdate-console-plugin_20_networkpolicy.yaml | 16 ---- ...er-update-console-plugin_30_configmap.yaml | 28 ------- ...r-update-console-plugin_50_deployment.yaml | 78 ------------------- ...ster-update-console-plugin_60_service.yaml | 20 ----- ...pdate-console-plugin_90_consoleplugin.yaml | 21 ----- install/image-references | 8 -- pkg/payload/render_test.go | 7 -- 9 files changed, 205 deletions(-) delete mode 100644 install/0000_50_cluster-update-console-plugin_10_namespace.yaml delete mode 100644 install/0000_50_cluster-update-console-plugin_15_serviceaccount.yaml delete mode 100644 install/0000_50_cluster-update-console-plugin_20_networkpolicy.yaml delete mode 100644 install/0000_50_cluster-update-console-plugin_30_configmap.yaml delete mode 100644 install/0000_50_cluster-update-console-plugin_50_deployment.yaml delete mode 100644 install/0000_50_cluster-update-console-plugin_60_service.yaml delete mode 100644 install/0000_50_cluster-update-console-plugin_90_consoleplugin.yaml delete mode 100644 install/image-references diff --git a/install/0000_50_cluster-update-console-plugin_10_namespace.yaml b/install/0000_50_cluster-update-console-plugin_10_namespace.yaml deleted file mode 100644 index dbfe4628b..000000000 --- a/install/0000_50_cluster-update-console-plugin_10_namespace.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: openshift-cluster-update-console-plugin - annotations: - kubernetes.io/description: The OpenShift cluster-update console plugin provides a web-console interface for managing ClusterVersion updates. - capability.openshift.io/name: Console - release.openshift.io/feature-set: TechPreviewNoUpgrade - exclude.release.openshift.io/internal-openshift-hosted: "true" - include.release.openshift.io/self-managed-high-availability: "true" - workload.openshift.io/allowed: management - labels: - openshift.io/cluster-monitoring: "true" - pod-security.kubernetes.io/audit: restricted - pod-security.kubernetes.io/enforce: restricted - pod-security.kubernetes.io/warn: restricted diff --git a/install/0000_50_cluster-update-console-plugin_15_serviceaccount.yaml b/install/0000_50_cluster-update-console-plugin_15_serviceaccount.yaml deleted file mode 100644 index e124a426b..000000000 --- a/install/0000_50_cluster-update-console-plugin_15_serviceaccount.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: cluster-update-console-plugin - namespace: openshift-cluster-update-console-plugin - annotations: - kubernetes.io/description: The OpenShift cluster-update console plugin provides a web-console interface for managing ClusterVersion updates. - capability.openshift.io/name: Console - release.openshift.io/feature-set: TechPreviewNoUpgrade - exclude.release.openshift.io/internal-openshift-hosted: "true" - include.release.openshift.io/self-managed-high-availability: "true" diff --git a/install/0000_50_cluster-update-console-plugin_20_networkpolicy.yaml b/install/0000_50_cluster-update-console-plugin_20_networkpolicy.yaml deleted file mode 100644 index 78bc82235..000000000 --- a/install/0000_50_cluster-update-console-plugin_20_networkpolicy.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: NetworkPolicy -metadata: - name: default-deny - namespace: openshift-cluster-update-console-plugin - annotations: - kubernetes.io/description: This NetworkPolicy is used to deny all ingress and egress traffic by default in this namespace, matching all Pods, and serving as a baseline. - capability.openshift.io/name: Console - release.openshift.io/feature-set: TechPreviewNoUpgrade - exclude.release.openshift.io/internal-openshift-hosted: "true" - include.release.openshift.io/self-managed-high-availability: "true" -spec: - podSelector: {} - policyTypes: - - Ingress - - Egress diff --git a/install/0000_50_cluster-update-console-plugin_30_configmap.yaml b/install/0000_50_cluster-update-console-plugin_30_configmap.yaml deleted file mode 100644 index 89ccc8a21..000000000 --- a/install/0000_50_cluster-update-console-plugin_30_configmap.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: cluster-update-console-plugin - namespace: openshift-cluster-update-console-plugin - annotations: - kubernetes.io/description: Nginx configuration for the cluster-update console plugin. - capability.openshift.io/name: Console - release.openshift.io/feature-set: TechPreviewNoUpgrade - exclude.release.openshift.io/internal-openshift-hosted: "true" - include.release.openshift.io/self-managed-high-availability: "true" -data: - nginx.conf: | - error_log /dev/stderr; - events {} - http { - access_log /dev/stdout; - include /etc/nginx/mime.types; - default_type application/octet-stream; - keepalive_timeout 65; - server { - listen 9001 ssl; - listen [::]:9001 ssl; - ssl_certificate /var/cert/tls.crt; - ssl_certificate_key /var/cert/tls.key; - root /usr/share/nginx/html; - } - } diff --git a/install/0000_50_cluster-update-console-plugin_50_deployment.yaml b/install/0000_50_cluster-update-console-plugin_50_deployment.yaml deleted file mode 100644 index 182f1db8b..000000000 --- a/install/0000_50_cluster-update-console-plugin_50_deployment.yaml +++ /dev/null @@ -1,78 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cluster-update-console-plugin - namespace: openshift-cluster-update-console-plugin - annotations: - kubernetes.io/description: The OpenShift cluster-update console plugin provides a web-console interface for managing ClusterVersion updates. - capability.openshift.io/name: Console - release.openshift.io/feature-set: TechPreviewNoUpgrade - exclude.release.openshift.io/internal-openshift-hosted: "true" - include.release.openshift.io/self-managed-high-availability: "true" -spec: - selector: - matchLabels: - app: cluster-update-console-plugin - strategy: - rollingUpdate: - maxSurge: 25% - maxUnavailable: 1 - type: RollingUpdate - template: - metadata: - annotations: - target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}' - openshift.io/required-scc: restricted-v3 - labels: - app: cluster-update-console-plugin - spec: - serviceAccountName: cluster-update-console-plugin - automountServiceAccountToken: false - containers: - - name: plugin - image: '{{index .Images "cluster-update-console-plugin"}}' - imagePullPolicy: IfNotPresent - ports: - - name: https - containerPort: 9001 - resources: - requests: - cpu: 20m - memory: 50Mi - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - terminationMessagePolicy: FallbackToLogsOnError - volumeMounts: - - mountPath: /var/cert - name: cluster-update-console-plugin-cert - readOnly: true - - mountPath: /etc/nginx/nginx.conf - name: nginx-conf - readOnly: true - subPath: nginx.conf - dnsPolicy: ClusterFirst - hostUsers: false - nodeSelector: - kubernetes.io/os: linux - priorityClassName: system-cluster-critical - securityContext: - runAsNonRoot: true - seccompProfile: - type: RuntimeDefault - terminationGracePeriodSeconds: 30 - tolerations: - - effect: NoSchedule - key: node-role.kubernetes.io/infra - operator: Exists - volumes: - - name: cluster-update-console-plugin-cert - secret: - defaultMode: 420 - secretName: cluster-update-console-plugin-cert - - name: nginx-conf - configMap: - name: cluster-update-console-plugin - defaultMode: 420 diff --git a/install/0000_50_cluster-update-console-plugin_60_service.yaml b/install/0000_50_cluster-update-console-plugin_60_service.yaml deleted file mode 100644 index cd5f7b2b4..000000000 --- a/install/0000_50_cluster-update-console-plugin_60_service.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: openshift-cluster-update-console-plugin - namespace: openshift-cluster-update-console-plugin - annotations: - kubernetes.io/description: The OpenShift cluster-update console plugin provides a web-console interface for managing ClusterVersion updates. - service.beta.openshift.io/serving-cert-secret-name: cluster-update-console-plugin-cert - capability.openshift.io/name: Console - release.openshift.io/feature-set: TechPreviewNoUpgrade - exclude.release.openshift.io/internal-openshift-hosted: "true" - include.release.openshift.io/self-managed-high-availability: "true" -spec: - type: ClusterIP - selector: - app: cluster-update-console-plugin - ports: - - name: https - port: 9001 - targetPort: https diff --git a/install/0000_50_cluster-update-console-plugin_90_consoleplugin.yaml b/install/0000_50_cluster-update-console-plugin_90_consoleplugin.yaml deleted file mode 100644 index 69bd0d9ee..000000000 --- a/install/0000_50_cluster-update-console-plugin_90_consoleplugin.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: console.openshift.io/v1 -kind: ConsolePlugin -metadata: - name: openshift-cluster-update-console-plugin - annotations: - kubernetes.io/description: The OpenShift cluster-update console plugin provides a web-console interface for managing ClusterVersion updates. - capability.openshift.io/name: Console - release.openshift.io/feature-set: TechPreviewNoUpgrade - exclude.release.openshift.io/internal-openshift-hosted: "true" - include.release.openshift.io/self-managed-high-availability: "true" -spec: - displayName: Cluster Updates - i18n: - loadType: Preload - backend: - type: Service - service: - name: openshift-cluster-update-console-plugin - namespace: openshift-cluster-update-console-plugin - port: 9001 - basePath: / diff --git a/install/image-references b/install/image-references deleted file mode 100644 index 32c17958f..000000000 --- a/install/image-references +++ /dev/null @@ -1,8 +0,0 @@ -kind: ImageStream -apiVersion: image.openshift.io/v1 -spec: - tags: - - name: cluster-update-console-plugin - from: - kind: DockerImage - name: placeholder.url.oc.will.replace.this.example.org:cluster-update-console-plugin diff --git a/pkg/payload/render_test.go b/pkg/payload/render_test.go index 64f19eb37..4644bd365 100644 --- a/pkg/payload/render_test.go +++ b/pkg/payload/render_test.go @@ -381,9 +381,6 @@ func Test_cvoManifests(t *testing.T) { config := manifestRenderConfig{ ReleaseImage: "quay.io/cvo/release:latest", ClusterProfile: "some-profile", - Images: map[string]string{ - "cluster-update-console-plugin": "quay.io/openshift/cluster-update-console-plugin:latest", - }, } tests := []struct { @@ -412,10 +409,6 @@ func Test_cvoManifests(t *testing.T) { return nil } - if _, fileName := filepath.Split(path); fileName == "image-references" { - return nil - } - var manifestsWithoutIncludeAnnotation []manifest.Manifest data, err := os.ReadFile(path) if err != nil {