djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust outputs from build-carvel-package, remove old files

Browse Source
This commit is contained in:
Benjamin A. Petersen 2023-10-03 14:01:23 -04:00
parent cb6d299156
commit e6707ca448
No known key found for this signature in database
GPG Key ID: EF6EF83523A4BE46
9 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deploy_carvel/concierge-pkginstall.yml
View File

@ -10,7 +10,7 @@ spec:
packageRef: packageRef:
refName: "concierge.pinniped.dev" refName: "concierge.pinniped.dev"
versionSelection: versionSelection:
constraints: "0.0.0-F3326187-009A-4313-B188-1B454D1A7E04" constraints: "0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D"
values: values:
- secretRef: - secretRef:
name: "concierge-package-install-secret" name: "concierge-package-install-secret"
@ -29,4 +29,4 @@ stringData:
log_level: debug log_level: debug
image_repo: kind-registry.local:5000/test/build image_repo: kind-registry.local:5000/test/build
image_tag: 0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 image_tag: 0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D

4
deploy_carvel/local-user-authenticator-pkginstall.yml
View File

@ -10,7 +10,7 @@ spec:
packageRef: packageRef:
refName: "local-user-authenticator.pinniped.dev" refName: "local-user-authenticator.pinniped.dev"
versionSelection: versionSelection:
constraints: "0.0.0-F3326187-009A-4313-B188-1B454D1A7E04" constraints: "0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D"
values: values:
- secretRef: - secretRef:
name: "local-user-authenticator-package-install-secret" name: "local-user-authenticator-package-install-secret"
@ -24,4 +24,4 @@ stringData:
values.yml: | values.yml: |
--- ---
image_repo: kind-registry.local:5000/test/build image_repo: kind-registry.local:5000/test/build
image_tag: 0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 image_tag: 0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D

18
deploy_carvel/package_repository/.imgpkg/images.yml
View File

@ -2,24 +2,24 @@
apiVersion: imgpkg.carvel.dev/v1alpha1 apiVersion: imgpkg.carvel.dev/v1alpha1
images: images:
- annotations: - annotations:
kbld.carvel.dev/id: kind-registry.local:5000/test/build/test/build-package-concierge:0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 kbld.carvel.dev/id: kind-registry.local:5000/test/build/test/build-package-concierge:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
kbld.carvel.dev/origins: | kbld.carvel.dev/origins: |
- resolved: - resolved:
tag: 0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 tag: 0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
url: kind-registry.local:5000/test/build/test/build-package-concierge:0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 url: kind-registry.local:5000/test/build/test/build-package-concierge:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
image: kind-registry.local:5000/test/build/test/build-package-concierge@sha256:ffc8371ff94e939233af0643476a597c025adb5609cc35c5ded6bd67ce13fdec image: kind-registry.local:5000/test/build/test/build-package-concierge@sha256:ffc8371ff94e939233af0643476a597c025adb5609cc35c5ded6bd67ce13fdec
- annotations: - annotations:
kbld.carvel.dev/id: kind-registry.local:5000/test/build/test/build-package-local-user-authenticator:0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 kbld.carvel.dev/id: kind-registry.local:5000/test/build/test/build-package-local-user-authenticator:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
kbld.carvel.dev/origins: | kbld.carvel.dev/origins: |
- resolved: - resolved:
tag: 0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 tag: 0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
url: kind-registry.local:5000/test/build/test/build-package-local-user-authenticator:0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 url: kind-registry.local:5000/test/build/test/build-package-local-user-authenticator:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
image: kind-registry.local:5000/test/build/test/build-package-local-user-authenticator@sha256:4f111f27ecf38622e4cbb29ce1d88589b488d8eb57d9b29cb577d64a417a2c4c image: kind-registry.local:5000/test/build/test/build-package-local-user-authenticator@sha256:4f111f27ecf38622e4cbb29ce1d88589b488d8eb57d9b29cb577d64a417a2c4c
- annotations: - annotations:
kbld.carvel.dev/id: kind-registry.local:5000/test/build/test/build-package-supervisor:0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 kbld.carvel.dev/id: kind-registry.local:5000/test/build/test/build-package-supervisor:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
kbld.carvel.dev/origins: | kbld.carvel.dev/origins: |
- resolved: - resolved:
tag: 0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 tag: 0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
url: kind-registry.local:5000/test/build/test/build-package-supervisor:0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 url: kind-registry.local:5000/test/build/test/build-package-supervisor:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
image: kind-registry.local:5000/test/build/test/build-package-supervisor@sha256:f3ceb23f0202c83955f4ad1a7836325340da25ebb6d2e14f02a66e915b4e09f5 image: kind-registry.local:5000/test/build/test/build-package-supervisor@sha256:f3ceb23f0202c83955f4ad1a7836325340da25ebb6d2e14f02a66e915b4e09f5
kind: ImagesLock kind: ImagesLock

6
deploy_carvel/package_repository/packages/concierge.pinniped.dev/0.0.0-F3326187-009A-4313-B188-1B454D1A7E04.yml → deploy_carvel/package_repository/packages/concierge.pinniped.dev/0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D.yml
View File

@ -1,10 +1,10 @@
apiVersion: data.packaging.carvel.dev/v1alpha1 apiVersion: data.packaging.carvel.dev/v1alpha1
kind: Package kind: Package
metadata: metadata:
name: concierge.pinniped.dev.0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 name: concierge.pinniped.dev.0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
spec: spec:
refName: concierge.pinniped.dev refName: concierge.pinniped.dev
version: 0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 version: 0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
releaseNotes: | releaseNotes: |
Initial release of the pinniped concierge package, TODO: AUTOMATE THIS?? Initial release of the pinniped concierge package, TODO: AUTOMATE THIS??
valuesSchema: valuesSchema:
@ -160,7 +160,7 @@ spec:
spec: spec:
fetch: fetch:
- imgpkgBundle: - imgpkgBundle:
image: kind-registry.local:5000/test/build/test/build-package-concierge:0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 image: kind-registry.local:5000/test/build/test/build-package-concierge:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
template: template:
- ytt: - ytt:
paths: paths:

6
deploy_carvel/package_repository/packages/local-user-authenticator.pinniped.dev/0.0.0-F3326187-009A-4313-B188-1B454D1A7E04.yml → deploy_carvel/package_repository/packages/local-user-authenticator.pinniped.dev/0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D.yml
View File

@ -1,10 +1,10 @@
apiVersion: data.packaging.carvel.dev/v1alpha1 apiVersion: data.packaging.carvel.dev/v1alpha1
kind: Package kind: Package
metadata: metadata:
name: local-user-authenticator.pinniped.dev.0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 name: local-user-authenticator.pinniped.dev.0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
spec: spec:
refName: local-user-authenticator.pinniped.dev refName: local-user-authenticator.pinniped.dev
version: 0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 version: 0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
releaseNotes: | releaseNotes: |
Initial release of the local-user-authenticator package, TODO: AUTOMATE THIS?? Initial release of the local-user-authenticator package, TODO: AUTOMATE THIS??
valuesSchema: valuesSchema:
@ -60,7 +60,7 @@ spec:
spec: spec:
fetch: fetch:
- imgpkgBundle: - imgpkgBundle:
image: kind-registry.local:5000/test/build/test/build-package-local-user-authenticator:0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 image: kind-registry.local:5000/test/build/test/build-package-local-user-authenticator:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
template: template:
- ytt: - ytt:
paths: paths:

6
deploy_carvel/package_repository/packages/supervisor.pinniped.dev/0.0.0-F3326187-009A-4313-B188-1B454D1A7E04.yml → deploy_carvel/package_repository/packages/supervisor.pinniped.dev/0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D.yml
View File

@ -1,10 +1,10 @@
apiVersion: data.packaging.carvel.dev/v1alpha1 apiVersion: data.packaging.carvel.dev/v1alpha1
kind: Package kind: Package
metadata: metadata:
name: supervisor.pinniped.dev.0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 name: supervisor.pinniped.dev.0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
spec: spec:
refName: supervisor.pinniped.dev refName: supervisor.pinniped.dev
version: 0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 version: 0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
releaseNotes: | releaseNotes: |
Initial release of the pinniped supervisor package, TODO: AUTOMATE THIS?? Initial release of the pinniped supervisor package, TODO: AUTOMATE THIS??
valuesSchema: valuesSchema:
@ -169,7 +169,7 @@ spec:
spec: spec:
fetch: fetch:
- imgpkgBundle: - imgpkgBundle:
image: kind-registry.local:5000/test/build/test/build-package-supervisor:0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 image: kind-registry.local:5000/test/build/test/build-package-supervisor:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
template: template:
- ytt: - ytt:
paths: paths:

10
deploy_carvel/packagerepository.0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D.yml Normal file
View File

@ -0,0 +1,10 @@
---
apiVersion: packaging.carvel.dev/v1alpha1
kind: PackageRepository
metadata:
name: "pinniped-package-repository"
namespace: "kapp-controller-packaging-global"
spec:
fetch:
imgpkgBundle:
image: "kind-registry.local:5000/test/build/test/build-package-repository-pinniped:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D"

4
deploy_carvel/supervisor-pkginstall.yml
View File

@ -10,7 +10,7 @@ spec:
packageRef: packageRef:
refName: "supervisor.pinniped.dev" refName: "supervisor.pinniped.dev"
versionSelection: versionSelection:
constraints: "0.0.0-F3326187-009A-4313-B188-1B454D1A7E04" constraints: "0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D"
values: values:
- secretRef: - secretRef:
name: "supervisor-package-install-secret" name: "supervisor-package-install-secret"
@ -27,7 +27,7 @@ stringData:
namespace: supervisor namespace: supervisor
api_group_suffix: pinniped.dev api_group_suffix: pinniped.dev
image_repo: kind-registry.local:5000/test/build image_repo: kind-registry.local:5000/test/build
image_tag: 0.0.0-F3326187-009A-4313-B188-1B454D1A7E04 image_tag: 0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
log_level: debug log_level: debug
service_https_nodeport_port: 443 service_https_nodeport_port: 443

5
hack/build-carvel-packages.sh
View File

@ -134,7 +134,6 @@ do
cp "deploy_carvel/${resource_name}/metadata.yml" "${package_repository_dir}/metadata.yml" cp "deploy_carvel/${resource_name}/metadata.yml" "${package_repository_dir}/metadata.yml"
done done
log_note "Generating .imgpkg/images.yml for Pinniped PackageRepository bundle..." log_note "Generating .imgpkg/images.yml for Pinniped PackageRepository bundle..."
mkdir -p "deploy_carvel/package_repository/.imgpkg" mkdir -p "deploy_carvel/package_repository/.imgpkg"
kbld --file "deploy_carvel/package_repository/packages/" --imgpkg-lock-output "deploy_carvel/package_repository/.imgpkg/images.yml" kbld --file "deploy_carvel/package_repository/packages/" --imgpkg-lock-output "deploy_carvel/package_repository/.imgpkg/images.yml"
@ -153,7 +152,9 @@ imgpkg pull --bundle "${package_repository_repo_tag}" --output "/tmp/${package_r
log_note "deploying PackageRepository..." log_note "deploying PackageRepository..."
pinniped_package_repository_name="pinniped-package-repository" pinniped_package_repository_name="pinniped-package-repository"
pinniped_package_repository_file="packagerepository.${pinniped_package_version}.yml" # TODO: deploy_carvel/ dir... # TODO: deploy_carvel/ dir...
# TODO: delete the "extras", so perhaps put this in a "deploy_carvel/tmp/" dir that can be cleaned.
pinniped_package_repository_file="deploy_carvel/packagerepository.${pinniped_package_version}.yml"
echo -n "" > "${pinniped_package_repository_file}" echo -n "" > "${pinniped_package_repository_file}"
cat <<EOT >> "${pinniped_package_repository_file}" cat <<EOT >> "${pinniped_package_repository_file}"
--- ---