Remove releaseplans from projectdevelopmentstreamtemplates

Because it is not supported in projectdevelopmentstreamtemplates currently.
redhat-appstudio · Jul 23, 2024 · 6fa5b65 · 6fa5b65
1 parent 4fb9d6d
commit 6fa5b65
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 88 deletions.
diff --git a/...s-pipeline-tenant/appstudio.redhat.com_v1alpha1_releaseplan_fbc-v4-17-release-as-fbc.yaml b/...s-pipeline-tenant/appstudio.redhat.com_v1alpha1_releaseplan_fbc-v4-17-release-as-fbc.yaml
@@ -8,5 +8,5 @@ metadata:
   name: fbc-v4-17-release-as-fbc
   namespace: clio-wrklds-pipeline-tenant
 spec:
-  application: cli-manager-operator-fbc-v4-17
+  application: cli-manager-operator-fbc-4-17
   target: rhtap-releng-tenant
diff --git a/...ne-tenant/appstudio.redhat.com_v1alpha1_releaseplan_fbc-v4-17-release-as-staging-fbc.yaml b/...ne-tenant/appstudio.redhat.com_v1alpha1_releaseplan_fbc-v4-17-release-as-staging-fbc.yaml
@@ -8,5 +8,5 @@ metadata:
   name: fbc-v4-17-release-as-staging-fbc
   namespace: clio-wrklds-pipeline-tenant
 spec:
-  application: cli-manager-operator-fbc-v4-17
+  application: cli-manager-operator-fbc-4-17
   target: rhtap-releng-tenant
diff --git a/...io_cli-manager-operator-fbc-v4-17-ec.yaml → ...rio_cli-manager-operator-fbc-4-17-ec.yaml b/...io_cli-manager-operator-fbc-v4-17-ec.yaml → ...rio_cli-manager-operator-fbc-4-17-ec.yaml
@@ -1,10 +1,10 @@
 apiVersion: appstudio.redhat.com/v1beta1
 kind: IntegrationTestScenario
 metadata:
-  name: cli-manager-operator-fbc-v4-17-ec
+  name: cli-manager-operator-fbc-4-17-ec
   namespace: clio-wrklds-pipeline-tenant
 spec:
-  application: cli-manager-operator-fbc-v4-17
+  application: cli-manager-operator-fbc-4-17
   params:
   - name: POLICY_CONFIGURATION
     value: rhtap-releng-tenant/fbc-stage
diff --git a/...tream_cli-manager-operator-fbc-v4-17.yaml → ...stream_cli-manager-operator-fbc-4-17.yaml b/...tream_cli-manager-operator-fbc-v4-17.yaml → ...stream_cli-manager-operator-fbc-4-17.yaml
@@ -1,14 +1,14 @@
 apiVersion: projctl.konflux.dev/v1beta1
 kind: ProjectDevelopmentStream
 metadata:
-  name: cli-manager-operator-fbc-v4-17
+  name: cli-manager-operator-fbc-4-17
   namespace: clio-wrklds-pipeline-tenant
 spec:
   project: clio-wrklds-pipeline-tenant
   template:
     name: cli-manager-operator-fbc-dst
     values:
     - name: version
-      value: "4.17"
+      value: v4.17
     - name: versionName
-      value: v4-17
+      value: 4-17
diff --git a/...tl.konflux.dev_v1beta1_projectdevelopmentstreamtemplate_cli-manager-operator-fbc-dst.yaml b/...tl.konflux.dev_v1beta1_projectdevelopmentstreamtemplate_cli-manager-operator-fbc-dst.yaml
@@ -44,45 +44,12 @@ spec:
           memory: 512Mi
       source:
         git:
-          context: '{{.versionName}}'
-          devfileUrl: https://raw.githubusercontent.com/openshift/cli-manager-operator/fbc/{{.versionName}}/devfile.yaml
+          context: '{{.version}}'
+          devfileUrl: https://raw.githubusercontent.com/openshift/cli-manager-operator/fbc/{{.version}}/devfile.yaml
           dockerfileUrl: catalog.Dockerfile
           revision: fbc
           url: https://github.com/openshift/cli-manager-operator
       targetPort: 50051
-  - apiVersion: appstudio.redhat.com/v1alpha1
-    kind: ReleasePlan
-    metadata:
-      labels:
-        release.appstudio.openshift.io/auto-release: "false"
-        release.appstudio.openshift.io/releasePlanAdmission: clio-wrklds-pipeline-fbc-prod-index
-        release.appstudio.openshift.io/standing-attribution: "true"
-      name: fbc-{{.versionName}}-release-as-fbc
-      namespace: clio-wrklds-pipeline-tenant
-    spec:
-      application: cli-manager-operator-fbc-{{.versionName}}
-      target: rhtap-releng-tenant
-  - apiVersion: appstudio.redhat.com/v1alpha1
-    kind: ReleasePlan
-    metadata:
-      labels:
-        release.appstudio.openshift.io/auto-release: "false"
-        release.appstudio.openshift.io/releasePlanAdmission: clio-wrklds-pipeline-fbc-staging-index
-        release.appstudio.openshift.io/standing-attribution: "true"
-      name: fbc-{{.versionName}}-release-as-staging-fbc
-      namespace: clio-wrklds-pipeline-tenant
-    spec:
-      application: cli-manager-operator-fbc-{{.versionName}}
-      target: rhtap-releng-tenant
-  - apiVersion: appstudio.redhat.com/v1beta1
-    kind: IntegrationTestScenario
-    metadata:
-      name: cli-manager-operator-fbc-{{.versionName}}-ec
-    spec:
-      application: cli-manager-operator-fbc-{{.versionName}}
-      params:
-      - name: POLICY_CONFIGURATION
-        value: rhtap-releng-tenant/fbc-stage
   variables:
   - description: A version number for a new OCP stream
     name: version

diff --git a/cluster/stone-prd-rh01/tenants/clio-wrklds-pipeline-tenant/_base/kustomization.yaml b/cluster/stone-prd-rh01/tenants/clio-wrklds-pipeline-tenant/_base/kustomization.yaml
@@ -4,4 +4,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 resources:
   - projectl.konflux.dev/projectdevelopmentstreamtemplates/file-based-catalog
   - projectl.konflux.dev/projectdevelopmentstreams/file-based-catalog-v4-17
-
diff --git a/...rojectl.konflux.dev/projectdevelopmentstreams/file-based-catalog-v4-17/kustomization.yaml b/...rojectl.konflux.dev/projectdevelopmentstreams/file-based-catalog-v4-17/kustomization.yaml
@@ -1,4 +1,4 @@
 kind: Kustomization
 apiVersion: kustomize.config.k8s.io/v1beta1
 resources:
-  - ./projectdevelopmentstream.yaml
+  - ./projectdevelopmentstream.yaml
diff --git a/...flux.dev/projectdevelopmentstreams/file-based-catalog-v4-17/projectdevelopmentstream.yaml b/...flux.dev/projectdevelopmentstreams/file-based-catalog-v4-17/projectdevelopmentstream.yaml
@@ -1,14 +1,13 @@
 apiVersion: projctl.konflux.dev/v1beta1
 kind: ProjectDevelopmentStream
 metadata:
-  name: cli-manager-operator-fbc-v4-17
+  name: cli-manager-operator-fbc-4-17
 spec:
   project: clio-wrklds-pipeline-tenant
   template:
     name: cli-manager-operator-fbc-dst
     values:
       - name: version
-        value: "4.17"
+        value: "v4.17"
       - name: versionName
-        value: "v4-17"
-
+        value: "4-17"
diff --git a/...jectl.konflux.dev/projectdevelopmentstreamtemplates/file-based-catalog/kustomization.yaml b/...jectl.konflux.dev/projectdevelopmentstreamtemplates/file-based-catalog/kustomization.yaml
@@ -1,4 +1,4 @@
 kind: Kustomization
 apiVersion: kustomize.config.k8s.io/v1beta1
 resources:
-  - ./projectdevelopmentstreamtemplate.yaml
+  - ./projectdevelopmentstreamtemplate.yaml
diff --git a/...rojectdevelopmentstreamtemplates/file-based-catalog/projectdevelopmentstreamtemplate.yaml b/...rojectdevelopmentstreamtemplates/file-based-catalog/projectdevelopmentstreamtemplate.yaml
@@ -50,42 +50,9 @@ spec:
             memory: 512Mi
         source:
           git:
-            context: "{{.versionName}}"
-            devfileUrl: "https://raw.githubusercontent.com/openshift/cli-manager-operator/fbc/{{.versionName}}/devfile.yaml"
+            context: "{{.version}}"
+            devfileUrl: "https://raw.githubusercontent.com/openshift/cli-manager-operator/fbc/{{.version}}/devfile.yaml"
             revision: "fbc"
             dockerfileUrl: catalog.Dockerfile
             url: https://github.com/openshift/cli-manager-operator
         targetPort: 50051
-    - apiVersion: appstudio.redhat.com/v1alpha1
-      kind: ReleasePlan
-      metadata:
-        name: "fbc-{{.versionName}}-release-as-fbc"
-        namespace: clio-wrklds-pipeline-tenant
-        labels:
-          release.appstudio.openshift.io/auto-release: 'false'
-          release.appstudio.openshift.io/standing-attribution: 'true'
-          release.appstudio.openshift.io/releasePlanAdmission: clio-wrklds-pipeline-fbc-prod-index
-      spec:
-        application: "cli-manager-operator-fbc-{{.versionName}}"
-        target: rhtap-releng-tenant
-    - apiVersion: appstudio.redhat.com/v1alpha1
-      kind: ReleasePlan
-      metadata:
-        name: "fbc-{{.versionName}}-release-as-staging-fbc"
-        namespace: clio-wrklds-pipeline-tenant
-        labels:
-          release.appstudio.openshift.io/auto-release: 'false'
-          release.appstudio.openshift.io/standing-attribution: 'true'
-          release.appstudio.openshift.io/releasePlanAdmission: clio-wrklds-pipeline-fbc-staging-index
-      spec:
-        application: "cli-manager-operator-fbc-{{.versionName}}"
-        target: rhtap-releng-tenant
-    - apiVersion: appstudio.redhat.com/v1beta1
-      kind: IntegrationTestScenario
-      metadata:
-        name: "cli-manager-operator-fbc-{{.versionName}}-ec"
-      spec:
-        application: "cli-manager-operator-fbc-{{.versionName}}"
-        params:
-          - name: POLICY_CONFIGURATION
-            value: rhtap-releng-tenant/fbc-stage
diff --git a/...t.com/integrationtestscenarios/fbc-v4-17-enterprise-contract/integrationtestscenario.yaml b/...t.com/integrationtestscenarios/fbc-v4-17-enterprise-contract/integrationtestscenario.yaml
@@ -1,9 +1,9 @@
 apiVersion: appstudio.redhat.com/v1beta1
 kind: IntegrationTestScenario
 metadata:
-  name: cli-manager-operator-fbc-v4-17-ec
+  name: cli-manager-operator-fbc-4-17-ec
 spec:
-  application: cli-manager-operator-fbc-v4-17
+  application: cli-manager-operator-fbc-4-17
   params:
     - name: POLICY_CONFIGURATION
       value: rhtap-releng-tenant/fbc-stage
diff --git a/...nant/fbc_4_17/appstudio.redhat.com/releaseplans/fbc-v4-17-release-as-fbc/releaseplan.yaml b/...nant/fbc_4_17/appstudio.redhat.com/releaseplans/fbc-v4-17-release-as-fbc/releaseplan.yaml
@@ -8,5 +8,5 @@ metadata:
     release.appstudio.openshift.io/standing-attribution: 'true'
     release.appstudio.openshift.io/releasePlanAdmission: clio-wrklds-pipeline-fbc-prod-index
 spec:
-  application: cli-manager-operator-fbc-v4-17
+  application: cli-manager-operator-fbc-4-17
   target: rhtap-releng-tenant
diff --git a/..._4_17/appstudio.redhat.com/releaseplans/fbc-v4-17-release-as-staging-fbc/releaseplan.yaml b/..._4_17/appstudio.redhat.com/releaseplans/fbc-v4-17-release-as-staging-fbc/releaseplan.yaml
@@ -8,5 +8,5 @@ metadata:
     release.appstudio.openshift.io/standing-attribution: 'true'
     release.appstudio.openshift.io/releasePlanAdmission: clio-wrklds-pipeline-fbc-staging-index
 spec:
-  application: cli-manager-operator-fbc-v4-17
+  application: cli-manager-operator-fbc-4-17
   target: rhtap-releng-tenant