Skip to content

PR to Issue #227#15

Merged
rbo merged 12 commits intomainfrom
issue-227
Jan 3, 2025
Merged

PR to Issue #227#15
rbo merged 12 commits intomainfrom
issue-227

Conversation

@rbo
Copy link
Copy Markdown
Member

@rbo rbo commented Jan 3, 2025

@rbo
Copy link
Copy Markdown
Member Author

rbo commented Jan 3, 2025

/retest

@benito-greybeard
Copy link
Copy Markdown

Diff overview

Environment Amount of diff lines
configuration/overlays/isar 0
configuration/overlays/coe-cluster 11
configuration/overlays/stormshift-ocp1 19
configuration/overlays/stormshift-ocp2 19
configuration/overlays/stormshift-ocp3 19
configuration/overlays/stormshift-ocp4 19
configuration/overlays/stormshift-ocp5 0
configuration/overlays/stormshift-ocp6 19
configuration/overlays/stormshift-ocp7 19
configuration/overlays/stormshift-ocp8 19
configuration/overlays/stormshift-rhacm 19
Diff configuration/overlays/coe-cluster
--- /tmp/coe-cluster.main.yaml	2025-01-03 15:04:33.412276628 +0000
+++ /tmp/coe-cluster.pr.yaml	2025-01-03 15:04:33.375277001 +0000
@@ -418,7 +418,7 @@
   name: cluster
 spec:
   trustedCA:
-    name: user-ca-bundle-v1
+    name: redhat-current-it-root-cas
 ---
 apiVersion: config.openshift.io/v1
 kind: Scheduler
Diff configuration/overlays/stormshift-ocp1
--- /tmp/stormshift-ocp1.main.yaml	2025-01-03 15:04:33.532275419 +0000
+++ /tmp/stormshift-ocp1.pr.yaml	2025-01-03 15:04:33.475275994 +0000
@@ -1116,6 +1116,16 @@
             - all
       serviceAccountName: trident-operator
 ---
+apiVersion: config.openshift.io/v1
+kind: Proxy
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true,Validate=false
+  name: cluster
+spec:
+  trustedCA:
+    name: redhat-current-it-root-cas
+---
 apiVersion: console.openshift.io/v1
 kind: ConsoleNotification
 metadata:
Diff configuration/overlays/stormshift-ocp2
--- /tmp/stormshift-ocp2.main.yaml	2025-01-03 15:04:33.574274996 +0000
+++ /tmp/stormshift-ocp2.pr.yaml	2025-01-03 15:04:33.555275188 +0000
@@ -276,6 +276,16 @@
   name: redhat-current-it-root-cas
   namespace: openshift-config
 ---
+apiVersion: config.openshift.io/v1
+kind: Proxy
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true,Validate=false
+  name: cluster
+spec:
+  trustedCA:
+    name: redhat-current-it-root-cas
+---
 apiVersion: operator.openshift.io/v1
 kind: Console
 metadata:
Diff configuration/overlays/stormshift-ocp3
--- /tmp/stormshift-ocp3.main.yaml	2025-01-03 15:04:33.612274614 +0000
+++ /tmp/stormshift-ocp3.pr.yaml	2025-01-03 15:04:33.597274765 +0000
@@ -276,6 +276,16 @@
   name: redhat-current-it-root-cas
   namespace: openshift-config
 ---
+apiVersion: config.openshift.io/v1
+kind: Proxy
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true,Validate=false
+  name: cluster
+spec:
+  trustedCA:
+    name: redhat-current-it-root-cas
+---
 apiVersion: operator.openshift.io/v1
 kind: Console
 metadata:
Diff configuration/overlays/stormshift-ocp4
--- /tmp/stormshift-ocp4.main.yaml	2025-01-03 15:04:33.706273667 +0000
+++ /tmp/stormshift-ocp4.pr.yaml	2025-01-03 15:04:33.660274130 +0000
@@ -828,6 +828,16 @@
             - all
       serviceAccountName: trident-operator
 ---
+apiVersion: config.openshift.io/v1
+kind: Proxy
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true,Validate=false
+  name: cluster
+spec:
+  trustedCA:
+    name: redhat-current-it-root-cas
+---
 apiVersion: console.openshift.io/v1
 kind: ConsoleNotification
 metadata:
Diff configuration/overlays/stormshift-ocp6
--- /tmp/stormshift-ocp6.main.yaml	2025-01-03 15:04:33.855272166 +0000
+++ /tmp/stormshift-ocp6.pr.yaml	2025-01-03 15:04:33.839272327 +0000
@@ -276,6 +276,16 @@
   name: redhat-current-it-root-cas
   namespace: openshift-config
 ---
+apiVersion: config.openshift.io/v1
+kind: Proxy
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true,Validate=false
+  name: cluster
+spec:
+  trustedCA:
+    name: redhat-current-it-root-cas
+---
 apiVersion: operator.openshift.io/v1
 kind: Console
 metadata:
Diff configuration/overlays/stormshift-ocp7
--- /tmp/stormshift-ocp7.main.yaml	2025-01-03 15:04:33.910271612 +0000
+++ /tmp/stormshift-ocp7.pr.yaml	2025-01-03 15:04:33.894271773 +0000
@@ -276,6 +276,16 @@
   name: redhat-current-it-root-cas
   namespace: openshift-config
 ---
+apiVersion: config.openshift.io/v1
+kind: Proxy
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true,Validate=false
+  name: cluster
+spec:
+  trustedCA:
+    name: redhat-current-it-root-cas
+---
 apiVersion: operator.openshift.io/v1
 kind: Console
 metadata:
Diff configuration/overlays/stormshift-ocp8
--- /tmp/stormshift-ocp8.main.yaml	2025-01-03 15:04:33.947271239 +0000
+++ /tmp/stormshift-ocp8.pr.yaml	2025-01-03 15:04:33.932271390 +0000
@@ -267,6 +267,16 @@
   name: redhat-current-it-root-cas
   namespace: openshift-config
 ---
+apiVersion: config.openshift.io/v1
+kind: Proxy
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true,Validate=false
+  name: cluster
+spec:
+  trustedCA:
+    name: redhat-current-it-root-cas
+---
 apiVersion: operator.openshift.io/v1
 kind: Console
 metadata:
Diff configuration/overlays/stormshift-rhacm
--- /tmp/stormshift-rhacm.main.yaml	2025-01-03 15:04:34.008270625 +0000
+++ /tmp/stormshift-rhacm.pr.yaml	2025-01-03 15:04:33.980270907 +0000
@@ -662,6 +662,16 @@
     fsGroup: ""
     runAsUser: ""
 ---
+apiVersion: config.openshift.io/v1
+kind: Proxy
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true,Validate=false
+  name: cluster
+spec:
+  trustedCA:
+    name: redhat-current-it-root-cas
+---
 apiVersion: operator.openshift.io/v1
 kind: Console
 metadata:

@benito-greybeard
Copy link
Copy Markdown

Diff overview

Environment Amount of diff lines
configuration/overlays/isar 0
configuration/overlays/stormshift-ocp1 19
configuration/overlays/stormshift-ocp4 19
configuration/overlays/stormshift-ocp5 0
Diff configuration/overlays/stormshift-ocp1
--- /tmp/stormshift-ocp1.main.yaml	2025-01-03 15:10:46.896514811 +0000
+++ /tmp/stormshift-ocp1.pr.yaml	2025-01-03 15:10:46.834515436 +0000
@@ -1116,6 +1116,16 @@
             - all
       serviceAccountName: trident-operator
 ---
+apiVersion: config.openshift.io/v1
+kind: Proxy
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true,Validate=false
+  name: cluster
+spec:
+  trustedCA:
+    name: redhat-current-it-root-cas
+---
 apiVersion: console.openshift.io/v1
 kind: ConsoleNotification
 metadata:
Diff configuration/overlays/stormshift-ocp4
--- /tmp/stormshift-ocp4.main.yaml	2025-01-03 15:10:47.004513723 +0000
+++ /tmp/stormshift-ocp4.pr.yaml	2025-01-03 15:10:46.955514217 +0000
@@ -828,6 +828,16 @@
             - all
       serviceAccountName: trident-operator
 ---
+apiVersion: config.openshift.io/v1
+kind: Proxy
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true,Validate=false
+  name: cluster
+spec:
+  trustedCA:
+    name: redhat-current-it-root-cas
+---
 apiVersion: console.openshift.io/v1
 kind: ConsoleNotification
 metadata:

@benito-greybeard
Copy link
Copy Markdown

Diff overview

Environment Amount of diff lines
configuration/overlays/isar 0
configuration/overlays/stormshift-ocp1 19
configuration/overlays/stormshift-ocp4 19
configuration/overlays/stormshift-ocp5 0
Diff configuration/overlays/stormshift-ocp1
--- /tmp/stormshift-ocp1.main.yaml	2025-01-03 15:16:57.960777370 +0000
+++ /tmp/stormshift-ocp1.pr.yaml	2025-01-03 15:16:57.904777934 +0000
@@ -1116,6 +1116,16 @@
             - all
       serviceAccountName: trident-operator
 ---
+apiVersion: config.openshift.io/v1
+kind: Proxy
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true,Validate=false
+  name: cluster
+spec:
+  trustedCA:
+    name: redhat-current-it-root-cas
+---
 apiVersion: console.openshift.io/v1
 kind: ConsoleNotification
 metadata:
Diff configuration/overlays/stormshift-ocp4
--- /tmp/stormshift-ocp4.main.yaml	2025-01-03 15:16:58.059776373 +0000
+++ /tmp/stormshift-ocp4.pr.yaml	2025-01-03 15:16:58.013776836 +0000
@@ -828,6 +828,16 @@
             - all
       serviceAccountName: trident-operator
 ---
+apiVersion: config.openshift.io/v1
+kind: Proxy
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true,Validate=false
+  name: cluster
+spec:
+  trustedCA:
+    name: redhat-current-it-root-cas
+---
 apiVersion: console.openshift.io/v1
 kind: ConsoleNotification
 metadata:

@benito-greybeard
Copy link
Copy Markdown

Diff overview

Environment Amount of diff lines
configuration/overlays/isar 0
configuration/overlays/stormshift-ocp1 19
configuration/overlays/stormshift-ocp4 19
configuration/overlays/stormshift-ocp5 0
Diff configuration/overlays/stormshift-ocp1
--- /tmp/stormshift-ocp1.main.yaml	2025-01-03 15:26:01.034306885 +0000
+++ /tmp/stormshift-ocp1.pr.yaml	2025-01-03 15:26:00.971307520 +0000
@@ -1116,6 +1116,16 @@
             - all
       serviceAccountName: trident-operator
 ---
+apiVersion: config.openshift.io/v1
+kind: Proxy
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true,Validate=false
+  name: cluster
+spec:
+  trustedCA:
+    name: redhat-current-it-root-cas
+---
 apiVersion: console.openshift.io/v1
 kind: ConsoleNotification
 metadata:
Diff configuration/overlays/stormshift-ocp4
--- /tmp/stormshift-ocp4.main.yaml	2025-01-03 15:26:01.144305777 +0000
+++ /tmp/stormshift-ocp4.pr.yaml	2025-01-03 15:26:01.092306301 +0000
@@ -828,6 +828,16 @@
             - all
       serviceAccountName: trident-operator
 ---
+apiVersion: config.openshift.io/v1
+kind: Proxy
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true,Validate=false
+  name: cluster
+spec:
+  trustedCA:
+    name: redhat-current-it-root-cas
+---
 apiVersion: console.openshift.io/v1
 kind: ConsoleNotification
 metadata:

@benito-greybeard
Copy link
Copy Markdown

Diff overview

Environment Amount of diff lines
configuration/overlays/isar 0
configuration/overlays/stormshift-ocp1 19
configuration/overlays/stormshift-ocp4 70
configuration/overlays/stormshift-ocp5 0
Diff configuration/overlays/stormshift-ocp1
--- /tmp/stormshift-ocp1.main.yaml	2025-01-03 15:29:16.088341928 +0000
+++ /tmp/stormshift-ocp1.pr.yaml	2025-01-03 15:29:16.019342623 +0000
@@ -1116,6 +1116,16 @@
             - all
       serviceAccountName: trident-operator
 ---
+apiVersion: config.openshift.io/v1
+kind: Proxy
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true,Validate=false
+  name: cluster
+spec:
+  trustedCA:
+    name: redhat-current-it-root-cas
+---
 apiVersion: console.openshift.io/v1
 kind: ConsoleNotification
 metadata:
Diff configuration/overlays/stormshift-ocp4
--- /tmp/stormshift-ocp4.main.yaml	2025-01-03 15:29:16.196340840 +0000
+++ /tmp/stormshift-ocp4.pr.yaml	2025-01-03 15:29:16.149341314 +0000
@@ -828,6 +828,16 @@
             - all
       serviceAccountName: trident-operator
 ---
+apiVersion: config.openshift.io/v1
+kind: Proxy
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true,Validate=false
+  name: cluster
+spec:
+  trustedCA:
+    name: redhat-current-it-root-cas
+---
 apiVersion: console.openshift.io/v1
 kind: ConsoleNotification
 metadata:
@@ -865,6 +875,32 @@
     deletionPolicy: Retain
     name: coe-netapp-svm-trident
 ---
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: ocp-coe-cert
+  namespace: openshift-ingress
+spec:
+  data:
+  - remoteRef:
+      key: coe-lab/certificate/api.ocp4.stormshift.coe.muc.redhat.com
+      property: cert_and_intermediate_pem
+    secretKey: tls.crt
+  - remoteRef:
+      key: coe-lab/certificate/api.ocp4.stormshift.coe.muc.redhat.com
+      property: key
+    secretKey: tls.key
+  refreshInterval: 12h
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: redhat-vault
+  target:
+    creationPolicy: Owner
+    deletionPolicy: Retain
+    name: ocp-coe-cert
+    template:
+      type: kubernetes.io/tls
+---
 apiVersion: machineconfiguration.openshift.io/v1
 kind: MachineConfig
 metadata:
@@ -943,6 +979,17 @@
       name: console-custom-logo
     customProductName: "\U0001F32A️ OCP4 - StormShift"
 ---
+apiVersion: operator.openshift.io/v1
+kind: IngressController
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true,Validate=false
+  name: default
+  namespace: openshift-ingress-operator
+spec:
+  defaultCertificate:
+    name: ocp-coe-cert
+---
 apiVersion: snapshot.storage.k8s.io/v1
 deletionPolicy: Delete
 driver: csi.trident.netapp.io

@rbo rbo merged commit 60427c7 into main Jan 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant