From 481dba60a7a7cf77464a6fe2f76c25c787298a4f Mon Sep 17 00:00:00 2001 From: Nico Schieder Date: Wed, 6 Dec 2023 16:54:19 +0100 Subject: [PATCH 1/4] Add repository example --- 4_repositories/README.md | 10 ++++ 4_repositories/build.sh | 14 +++++ .../pkgs/pkg-a/v0.1.0/manifest.yaml | 18 ++++++ .../pkgs/pkg-a/v0.2.0/manifest.yaml | 18 ++++++ .../pkgs/pkg-a/v0.3.0/manifest.yaml | 18 ++++++ 4_repositories/repo.yaml | 60 +++++++++++++++++++ 4_repositories/root/manifest.lock.yaml | 6 ++ 4_repositories/root/manifest.yaml | 23 +++++++ 8 files changed, 167 insertions(+) create mode 100644 4_repositories/README.md create mode 100755 4_repositories/build.sh create mode 100644 4_repositories/pkgs/pkg-a/v0.1.0/manifest.yaml create mode 100644 4_repositories/pkgs/pkg-a/v0.2.0/manifest.yaml create mode 100644 4_repositories/pkgs/pkg-a/v0.3.0/manifest.yaml create mode 100644 4_repositories/repo.yaml create mode 100644 4_repositories/root/manifest.lock.yaml create mode 100644 4_repositories/root/manifest.yaml diff --git a/4_repositories/README.md b/4_repositories/README.md new file mode 100644 index 0000000..8e20b72 --- /dev/null +++ b/4_repositories/README.md @@ -0,0 +1,10 @@ +# Repositories + +## Packages + +### pkg-a + +Versions: +- **v0.1.0** Works with OpenShift 4.11.x +- **v0.2.0** Works with OpenShift 4.12 - 4.14 (But not 4.13.5 - known regression) +- **v0.3.0** Works with OpenShift 4.15.x \ No newline at end of file diff --git a/4_repositories/build.sh b/4_repositories/build.sh new file mode 100755 index 0000000..a4cea03 --- /dev/null +++ b/4_repositories/build.sh @@ -0,0 +1,14 @@ +#!/bin/bash +set -euo pipefail + +# build package images +PKG_A_REPO="quay.io/nschiede/pkg-a" +kubectl package build ./pkgs/pkg-a/v0.1.0 --tag="${PKG_A_REPO}:v0.1.0" --push +kubectl package build ./pkgs/pkg-a/v0.2.0 --tag="${PKG_A_REPO}:v0.2.0" --push +kubectl package build ./pkgs/pkg-a/v0.3.0 --tag="${PKG_A_REPO}:v0.3.0" --push + +rm repo.yaml +kubectl package repo initialize repo.yaml my-repo +kubectl package repo add repo.yaml "${PKG_A_REPO}:v0.1.0" 0.1.0 +kubectl package repo add repo.yaml "${PKG_A_REPO}:v0.2.0" 0.2.0 +kubectl package repo add repo.yaml "${PKG_A_REPO}:v0.3.0" 0.3.0 \ No newline at end of file diff --git a/4_repositories/pkgs/pkg-a/v0.1.0/manifest.yaml b/4_repositories/pkgs/pkg-a/v0.1.0/manifest.yaml new file mode 100644 index 0000000..b6ace0e --- /dev/null +++ b/4_repositories/pkgs/pkg-a/v0.1.0/manifest.yaml @@ -0,0 +1,18 @@ +apiVersion: manifests.package-operator.run/v1alpha1 +kind: PackageManifest +metadata: + name: pkg-a + annotations: + version: v0.1.0 +spec: + scopes: + - Cluster + - Namespaced + phases: + - name: deploy + constraints: + - platform: + - OpenShift + - platformVersion: + name: OpenShift + range: 4.11.x \ No newline at end of file diff --git a/4_repositories/pkgs/pkg-a/v0.2.0/manifest.yaml b/4_repositories/pkgs/pkg-a/v0.2.0/manifest.yaml new file mode 100644 index 0000000..57b132a --- /dev/null +++ b/4_repositories/pkgs/pkg-a/v0.2.0/manifest.yaml @@ -0,0 +1,18 @@ +apiVersion: manifests.package-operator.run/v1alpha1 +kind: PackageManifest +metadata: + name: pkg-a + annotations: + version: v0.2.0 +spec: + scopes: + - Cluster + - Namespaced + phases: + - name: deploy + constraints: + - platform: + - OpenShift + - platformVersion: + name: OpenShift + range: 4.12.x - 4.14.x && != 4.13.5 \ No newline at end of file diff --git a/4_repositories/pkgs/pkg-a/v0.3.0/manifest.yaml b/4_repositories/pkgs/pkg-a/v0.3.0/manifest.yaml new file mode 100644 index 0000000..626b51a --- /dev/null +++ b/4_repositories/pkgs/pkg-a/v0.3.0/manifest.yaml @@ -0,0 +1,18 @@ +apiVersion: manifests.package-operator.run/v1alpha1 +kind: PackageManifest +metadata: + name: pkg-a + annotations: + version: v0.3.0 +spec: + scopes: + - Cluster + - Namespaced + phases: + - name: deploy + constraints: + - platform: + - OpenShift + - platformVersion: + name: OpenShift + range: 4.15.x \ No newline at end of file diff --git a/4_repositories/repo.yaml b/4_repositories/repo.yaml new file mode 100644 index 0000000..39b0861 --- /dev/null +++ b/4_repositories/repo.yaml @@ -0,0 +1,60 @@ +--- +apiVersion: manifests.package-operator.run/v1alpha1 +kind: Repository +metadata: + creationTimestamp: "2023-12-06T15:49:51Z" + name: my-repo +--- +apiVersion: manifests.package-operator.run/v1alpha1 +data: + constraints: + - platform: + - OpenShift + - platformVersion: + name: OpenShift + range: 4.11.x + digest: 9f62412e643b6e3a8a2b3997e955062af3813dfe2aa577a01f724daa1033cd98 + image: quay.io/nschiede/pkg-a + name: pkg-a + versions: + - v0.1.0 +kind: RepositoryEntry +metadata: + creationTimestamp: null + name: pkg-a.9f62412e643b6e3a8a2b3997e955062af3813dfe2aa577a01f724daa1033cd98 +--- +apiVersion: manifests.package-operator.run/v1alpha1 +data: + constraints: + - platform: + - OpenShift + - platformVersion: + name: OpenShift + range: 4.12.x - 4.14.x && != 4.13.5 + digest: 037ff25265533a1f314e20ba8f4825836a9712443c04a6cdf4f741c09163f861 + image: quay.io/nschiede/pkg-a + name: pkg-a + versions: + - v0.2.0 +kind: RepositoryEntry +metadata: + creationTimestamp: null + name: pkg-a.037ff25265533a1f314e20ba8f4825836a9712443c04a6cdf4f741c09163f861 +--- +apiVersion: manifests.package-operator.run/v1alpha1 +data: + constraints: + - platform: + - OpenShift + - platformVersion: + name: OpenShift + range: 4.15.x + digest: 1f1347f666c05a769548d8e16e5c92a3304ce7603f67f0e3a2801d1f4d102c5b + image: quay.io/nschiede/pkg-a + name: pkg-a + versions: + - v0.3.0 +kind: RepositoryEntry +metadata: + creationTimestamp: null + name: pkg-a.1f1347f666c05a769548d8e16e5c92a3304ce7603f67f0e3a2801d1f4d102c5b diff --git a/4_repositories/root/manifest.lock.yaml b/4_repositories/root/manifest.lock.yaml new file mode 100644 index 0000000..7f8097d --- /dev/null +++ b/4_repositories/root/manifest.lock.yaml @@ -0,0 +1,6 @@ +apiVersion: manifests.package-operator.run/v1alpha1 +kind: PackageManifestLock +metadata: + creationTimestamp: "2023-12-06T15:52:18Z" +spec: + images: [] diff --git a/4_repositories/root/manifest.yaml b/4_repositories/root/manifest.yaml new file mode 100644 index 0000000..25ffebc --- /dev/null +++ b/4_repositories/root/manifest.yaml @@ -0,0 +1,23 @@ +apiVersion: manifests.package-operator.run/v1alpha1 +kind: PackageManifest +metadata: + name: root +spec: + scopes: + - Cluster + - Namespaced + phases: + - name: deploy + constraints: + - platform: + - OpenShift + - platformVersion: + name: OpenShift + range: 4.11.x + dependencies: + - image: + name: my-pkg + package: my-pkg.my-repo + # range: '>=2.1' + repositories: + - image: quay.io/package-operator/my-repo:latest \ No newline at end of file From 7b1d547723327816388f900652bbff3c8728ab67 Mon Sep 17 00:00:00 2001 From: Nico Schieder Date: Wed, 6 Dec 2023 22:27:56 +0100 Subject: [PATCH 2/4] f --- 4_repositories/repo.yaml | 2 +- 4_repositories/root/manifest.lock.yaml | 6 ------ 4_repositories/root/manifest.yaml | 8 ++++---- 3 files changed, 5 insertions(+), 11 deletions(-) delete mode 100644 4_repositories/root/manifest.lock.yaml diff --git a/4_repositories/repo.yaml b/4_repositories/repo.yaml index 39b0861..305c720 100644 --- a/4_repositories/repo.yaml +++ b/4_repositories/repo.yaml @@ -2,7 +2,7 @@ apiVersion: manifests.package-operator.run/v1alpha1 kind: Repository metadata: - creationTimestamp: "2023-12-06T15:49:51Z" + creationTimestamp: "2023-12-06T18:10:01Z" name: my-repo --- apiVersion: manifests.package-operator.run/v1alpha1 diff --git a/4_repositories/root/manifest.lock.yaml b/4_repositories/root/manifest.lock.yaml deleted file mode 100644 index 7f8097d..0000000 --- a/4_repositories/root/manifest.lock.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: manifests.package-operator.run/v1alpha1 -kind: PackageManifestLock -metadata: - creationTimestamp: "2023-12-06T15:52:18Z" -spec: - images: [] diff --git a/4_repositories/root/manifest.yaml b/4_repositories/root/manifest.yaml index 25ffebc..2c7492b 100644 --- a/4_repositories/root/manifest.yaml +++ b/4_repositories/root/manifest.yaml @@ -16,8 +16,8 @@ spec: range: 4.11.x dependencies: - image: - name: my-pkg - package: my-pkg.my-repo - # range: '>=2.1' + name: pkg-a + package: pkg-a.my-repo + # range: '0-1' repositories: - - image: quay.io/package-operator/my-repo:latest \ No newline at end of file + - file: repo.yaml \ No newline at end of file From c32760ba277171f97be547cf411d35350c238299 Mon Sep 17 00:00:00 2001 From: Nico Schieder Date: Wed, 12 Jun 2024 11:09:34 +0200 Subject: [PATCH 3/4] f --- 4_repositories/pkgs/pkg-a/v0.1.0/manifest.yaml | 2 +- 4_repositories/pkgs/pkg-a/v0.3.0/manifest.yaml | 2 +- 4_repositories/repo.yaml | 4 ++-- 4_repositories/root/manifest.yaml | 11 +++++++++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/4_repositories/pkgs/pkg-a/v0.1.0/manifest.yaml b/4_repositories/pkgs/pkg-a/v0.1.0/manifest.yaml index b6ace0e..bb7f1af 100644 --- a/4_repositories/pkgs/pkg-a/v0.1.0/manifest.yaml +++ b/4_repositories/pkgs/pkg-a/v0.1.0/manifest.yaml @@ -15,4 +15,4 @@ spec: - OpenShift - platformVersion: name: OpenShift - range: 4.11.x \ No newline at end of file + range: '~4.11.x' \ No newline at end of file diff --git a/4_repositories/pkgs/pkg-a/v0.3.0/manifest.yaml b/4_repositories/pkgs/pkg-a/v0.3.0/manifest.yaml index 626b51a..e2e1169 100644 --- a/4_repositories/pkgs/pkg-a/v0.3.0/manifest.yaml +++ b/4_repositories/pkgs/pkg-a/v0.3.0/manifest.yaml @@ -15,4 +15,4 @@ spec: - OpenShift - platformVersion: name: OpenShift - range: 4.15.x \ No newline at end of file + range: '~4.15.x' \ No newline at end of file diff --git a/4_repositories/repo.yaml b/4_repositories/repo.yaml index 305c720..307f76e 100644 --- a/4_repositories/repo.yaml +++ b/4_repositories/repo.yaml @@ -12,7 +12,7 @@ data: - OpenShift - platformVersion: name: OpenShift - range: 4.11.x + range: '~4.11' digest: 9f62412e643b6e3a8a2b3997e955062af3813dfe2aa577a01f724daa1033cd98 image: quay.io/nschiede/pkg-a name: pkg-a @@ -48,7 +48,7 @@ data: - OpenShift - platformVersion: name: OpenShift - range: 4.15.x + range: '~4.15' digest: 1f1347f666c05a769548d8e16e5c92a3304ce7603f67f0e3a2801d1f4d102c5b image: quay.io/nschiede/pkg-a name: pkg-a diff --git a/4_repositories/root/manifest.yaml b/4_repositories/root/manifest.yaml index 2c7492b..53f82a2 100644 --- a/4_repositories/root/manifest.yaml +++ b/4_repositories/root/manifest.yaml @@ -13,11 +13,18 @@ spec: - OpenShift - platformVersion: name: OpenShift - range: 4.11.x + # range: '>=4.12,<4.13' + range: '~4.13' + # range: '~4.14' # 4.11.0 - 4.11.x + # range: '~4.12' # 4.12.0 - 4.12.x dependencies: - image: name: pkg-a package: pkg-a.my-repo # range: '0-1' repositories: - - file: repo.yaml \ No newline at end of file + - file: repo.yaml + # repository contains + # - pkg-a@0.1.0 [OpenShift ~4.11] + # - pkg-a@0.2.0 [OpenShift 4.12.x - 4.14.x && != 4.13.5] + # - pkg-a@0.3.0 [OpenShift ~4.15] \ No newline at end of file From 9e195fbfbafe2b86ec6e5bf63425c9956cf316d3 Mon Sep 17 00:00:00 2001 From: Nico Schieder Date: Fri, 15 May 2026 10:03:45 +0200 Subject: [PATCH 4/4] Update pkg-a --- 4_repositories/repo.yaml | 17 +++++++---------- 4_repositories/root/manifest.lock.yaml | 11 +++++++++++ 4_repositories/root/manifest.yaml | 6 ++++-- 3 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 4_repositories/root/manifest.lock.yaml diff --git a/4_repositories/repo.yaml b/4_repositories/repo.yaml index 307f76e..c78a47b 100644 --- a/4_repositories/repo.yaml +++ b/4_repositories/repo.yaml @@ -2,7 +2,7 @@ apiVersion: manifests.package-operator.run/v1alpha1 kind: Repository metadata: - creationTimestamp: "2023-12-06T18:10:01Z" + creationTimestamp: "2026-05-15T07:31:17Z" name: my-repo --- apiVersion: manifests.package-operator.run/v1alpha1 @@ -12,16 +12,15 @@ data: - OpenShift - platformVersion: name: OpenShift - range: '~4.11' - digest: 9f62412e643b6e3a8a2b3997e955062af3813dfe2aa577a01f724daa1033cd98 + range: ~4.11.x + digest: ab985be7292e13b696eaabbd02606a0af810cc9c5ae8e74be7c88865c949d720 image: quay.io/nschiede/pkg-a name: pkg-a versions: - v0.1.0 kind: RepositoryEntry metadata: - creationTimestamp: null - name: pkg-a.9f62412e643b6e3a8a2b3997e955062af3813dfe2aa577a01f724daa1033cd98 + name: pkg-a.ab985be7292e13b696eaabbd02606a0af810cc9c5ae8e74be7c88865c949d720 --- apiVersion: manifests.package-operator.run/v1alpha1 data: @@ -38,7 +37,6 @@ data: - v0.2.0 kind: RepositoryEntry metadata: - creationTimestamp: null name: pkg-a.037ff25265533a1f314e20ba8f4825836a9712443c04a6cdf4f741c09163f861 --- apiVersion: manifests.package-operator.run/v1alpha1 @@ -48,13 +46,12 @@ data: - OpenShift - platformVersion: name: OpenShift - range: '~4.15' - digest: 1f1347f666c05a769548d8e16e5c92a3304ce7603f67f0e3a2801d1f4d102c5b + range: ~4.15.x + digest: f1a73f5657459822bd819ba91f15431d425f4bacd0f77946246ad25e22274a55 image: quay.io/nschiede/pkg-a name: pkg-a versions: - v0.3.0 kind: RepositoryEntry metadata: - creationTimestamp: null - name: pkg-a.1f1347f666c05a769548d8e16e5c92a3304ce7603f67f0e3a2801d1f4d102c5b + name: pkg-a.f1a73f5657459822bd819ba91f15431d425f4bacd0f77946246ad25e22274a55 diff --git a/4_repositories/root/manifest.lock.yaml b/4_repositories/root/manifest.lock.yaml new file mode 100644 index 0000000..57d77f8 --- /dev/null +++ b/4_repositories/root/manifest.lock.yaml @@ -0,0 +1,11 @@ +apiVersion: manifests.package-operator.run/v1alpha1 +kind: PackageManifestLock +metadata: + creationTimestamp: "2026-05-15T07:40:14Z" +spec: + dependencies: + - digest: 037ff25265533a1f314e20ba8f4825836a9712443c04a6cdf4f741c09163f861 + image: quay.io/nschiede/pkg-a + name: pkg-a + version: 0.2.0 + images: [] diff --git a/4_repositories/root/manifest.yaml b/4_repositories/root/manifest.yaml index 53f82a2..ef70810 100644 --- a/4_repositories/root/manifest.yaml +++ b/4_repositories/root/manifest.yaml @@ -14,8 +14,10 @@ spec: - platformVersion: name: OpenShift # range: '>=4.12,<4.13' - range: '~4.13' - # range: '~4.14' # 4.11.0 - 4.11.x + # range: '=4.13.3' + # range: '=4.13.5' # no package supports this version + range: '4.13.0 - 4.13.4' + # range: '~4.11' # 4.11.0 - 4.11.x # range: '~4.12' # 4.12.0 - 4.12.x dependencies: - image: