From 43085ac7f097779bce22488b6db2ae1b4f01ced6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 22 Oct 2022 20:08:32 +0000 Subject: [PATCH 1/6] Update Metrics Server metadata and add version 0.6.1 --- .../0.6.1.yml | 190 +++++++++--------- .../metadata.yml | 22 +- 2 files changed, 110 insertions(+), 102 deletions(-) diff --git a/repo/packages/metrics-server.packages.kadras.io/0.6.1.yml b/repo/packages/metrics-server.packages.kadras.io/0.6.1.yml index ccd121e..b7ee7a4 100644 --- a/repo/packages/metrics-server.packages.kadras.io/0.6.1.yml +++ b/repo/packages/metrics-server.packages.kadras.io/0.6.1.yml @@ -1,143 +1,149 @@ apiVersion: data.packaging.carvel.dev/v1alpha1 kind: Package metadata: + creationTimestamp: null name: metrics-server.packages.kadras.io.0.6.1 spec: + licenses: + - Apache 2.0 + refName: metrics-server.packages.kadras.io + releaseNotes: https://github.com/kubernetes-sigs/metrics-server/releases + releasedAt: "2022-10-22T20:07:36Z" + template: + spec: + deploy: + - kapp: {} + fetch: + - imgpkgBundle: + image: ghcr.io/arktonix/package-for-metrics-server@sha256:ea17539f905f37760155a9df26c848dcda2273875d4aa06b369e7a6dfd5e2c8a + template: + - ytt: + paths: + - config + - kbld: + paths: + - '-' + - .imgpkg/images.yml valuesSchema: openAPIv3: - type: object additionalProperties: false description: OpenAPIv3 Schema for metrics-server properties: - namespace: - type: string - description: The namespace in which metrics-server is deployed - default: kube-system - nodeSelector: - nullable: true - description: NodeSelector configuration applied to all the deployments - default: null - deployment: - type: object + daemonset: additionalProperties: false properties: updateStrategy: - type: string - nullable: true - description: Update strategy of deployments default: null + description: Update strategy of daemonsets + nullable: true + type: string + type: object + deployment: + additionalProperties: false + properties: rollingUpdate: - type: object additionalProperties: false properties: - maxUnavailable: - type: integer - nullable: true - description: The maxUnavailable of rollingUpdate. Applied only if RollingUpdate is used as updateStrategy - default: null maxSurge: - type: integer + default: null + description: The maxSurge of rollingUpdate. Applied only if RollingUpdate + is used as updateStrategy nullable: true - description: The maxSurge of rollingUpdate. Applied only if RollingUpdate is used as updateStrategy + type: integer + maxUnavailable: default: null - daemonset: - type: object - additionalProperties: false - properties: + description: The maxUnavailable of rollingUpdate. Applied only if + RollingUpdate is used as updateStrategy + nullable: true + type: integer + type: object updateStrategy: - type: string - nullable: true - description: Update strategy of daemonsets default: null - metricsServer: + description: Update strategy of deployments + nullable: true + type: string type: object + metricsServer: additionalProperties: false properties: - namespace: - type: string - nullable: true - description: The namespace value used by older templates, will be overwriten if top level namespace is present, kept for backward compatibility - default: null - createNamespace: - type: boolean - description: Whether to create namespace specified for metrics-server - default: true config: - type: object additionalProperties: false properties: - securePort: - type: integer - description: The HTTPS secure port used by metrics-server - default: 4443 - updateStrategy: - type: string - description: The update strategy of the metrics-server deployment - default: RollingUpdate + apiServiceInsecureTLS: + default: true + description: Whether to enable insecure TLS for metrics-server api + service + type: boolean args: - type: array + default: [] description: Arguments passed into metrics-server container items: - type: string default: "" - default: [] + type: string + type: array probe: - type: object additionalProperties: false properties: failureThreshold: - type: integer - description: Probe failureThreshold of metrics-server deployment default: 3 - periodSeconds: + description: Probe failureThreshold of metrics-server deployment type: integer - description: Probe period of metrics-server deployment + periodSeconds: default: 10 - apiServiceInsecureTLS: - type: boolean - description: Whether to enable insecure TLS for metrics-server api service - default: true + description: Probe period of metrics-server deployment + type: integer + type: object + securePort: + default: 4443 + description: The HTTPS secure port used by metrics-server + type: integer tolerations: - nullable: true - description: Metrics-server deployment tolerations default: [] - image: + description: Metrics-server deployment tolerations + nullable: true + updateStrategy: + default: RollingUpdate + description: The update strategy of the metrics-server deployment + type: string type: object + createNamespace: + default: true + description: Whether to create namespace specified for metrics-server + type: boolean + image: additionalProperties: false properties: - repository: - type: string - description: The repository of metrics-server image - default: "" name: - type: string + default: "" description: The path of image + type: string + pullPolicy: + default: IfNotPresent + description: The pull policy of image + type: string + repository: default: "" - tag: + description: The repository of metrics-server image type: string - description: The image tag + tag: default: "" - pullPolicy: + description: The image tag type: string - description: The pull policy of image - default: IfNotPresent - refName: metrics-server.packages.kadras.io + type: object + namespace: + default: null + description: The namespace value used by older templates, will be overwriten + if top level namespace is present, kept for backward compatibility + nullable: true + type: string + type: object + namespace: + default: kube-system + description: The namespace in which metrics-server is deployed + type: string + nodeSelector: + default: null + description: NodeSelector configuration applied to all the deployments + nullable: true + type: object version: 0.6.1 - releaseNotes: metrics-server 0.6.1 https://github.com/kubernetes-sigs/metrics-server/releases/tag/v0.6.1 - licenses: - - Apache 2.0 - template: - spec: - fetch: - - imgpkgBundle: - image: projects.registry.vmware.com/tce/metrics-server@sha256:55f29f8ba79933204c49642b1c9b745e1d60af3221d16b7772f4ba1b7ad60725 - template: - - ytt: - paths: - - config/ - - kbld: - paths: - - '-' - - .imgpkg/images.yml - deploy: - - kapp: {} diff --git a/repo/packages/metrics-server.packages.kadras.io/metadata.yml b/repo/packages/metrics-server.packages.kadras.io/metadata.yml index 93de629..22e6aa8 100644 --- a/repo/packages/metrics-server.packages.kadras.io/metadata.yml +++ b/repo/packages/metrics-server.packages.kadras.io/metadata.yml @@ -1,16 +1,18 @@ apiVersion: data.packaging.carvel.dev/v1alpha1 kind: PackageMetadata metadata: + creationTimestamp: null name: metrics-server.packages.kadras.io spec: - displayName: "metrics-server" - longDescription: "Metrics Server is a scalable, efficient source of container resource metrics for Kubernetes built-in autoscaling pipelines." - shortDescription: "Metrics Server is a scalable, efficient source of container resource metrics for Kubernetes built-in autoscaling pipelines." - providerName: VMware - maintainers: - - name: Guanpeng Gao categories: - - "observability" - - "metrics-server" - - "cluster" - - "metrics" + - monitoring + - metrics + - observability + displayName: metrics-server + longDescription: Metrics Server is a scalable and efficient source of container + resource metrics for Kubernetes built-in autoscaling pipelines. + maintainers: + - name: Thomas Vitale + providerName: Arktonix + shortDescription: Scalable and efficient source of container resource metrics for + Kubernetes built-in autoscaling pipelines. From 1fe6c56d00f568d09fb0a028bdf92e4b3fb9dc9a Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Sat, 22 Oct 2022 22:14:29 +0200 Subject: [PATCH 2/6] Add Metrics Server 0.6.1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4823100..1ee64b7 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ The following packages are maintained by the [Arktonix](https://github.com/arkto * [knative-eventing](https://github.com/arktonix/package-for-knative-eventing) * [knative-serving](https://github.com/arktonix/package-for-knative-serving) * [kpack-dependencies](https://github.com/arktonix/kpack-dependencies) +* [metrics-server](https://github.com/arktonix/package-for-metrics-server) * [namespace-setup](https://github.com/arktonix/namespace-setup) * [spring-boot-conventions](https://github.com/arktonix/package-for-spring-boot-conventions) * [tekton-pipelines](https://github.com/arktonix/package-for-tekton-pipelines) @@ -27,7 +28,6 @@ It also includes the following open-source packages maintained by the [VMware Ta * [cartographer](https://github.com/vmware-tanzu/package-for-cartographer) * [cert-manager](https://github.com/vmware-tanzu/community-edition/tree/main/addons/packages/cert-manager) * [kpack](https://github.com/vmware-tanzu/package-for-kpack) -* [metrics-server](https://github.com/vmware-tanzu/community-edition/tree/main/addons/packages/metrics-server) * [secretgen-controller](https://github.com/vmware-tanzu/carvel-secretgen-controller) ## Prerequisites From 980a7dc04a9d837d90e36c72a4064baa8ef3b3c6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 22 Oct 2022 20:57:31 +0000 Subject: [PATCH 3/6] Update Cert Manager metadata and add version 1.10.0 --- .../1.10.0.yml | 36 +++++++++++++++++++ .../metadata.yml | 21 +++++------ 2 files changed, 47 insertions(+), 10 deletions(-) create mode 100644 repo/packages/cert-manager.packages.kadras.io/1.10.0.yml diff --git a/repo/packages/cert-manager.packages.kadras.io/1.10.0.yml b/repo/packages/cert-manager.packages.kadras.io/1.10.0.yml new file mode 100644 index 0000000..9dd6191 --- /dev/null +++ b/repo/packages/cert-manager.packages.kadras.io/1.10.0.yml @@ -0,0 +1,36 @@ +apiVersion: data.packaging.carvel.dev/v1alpha1 +kind: Package +metadata: + creationTimestamp: null + name: cert-manager.packages.kadras.io.1.10.0 +spec: + licenses: + - Apache 2.0 + refName: cert-manager.packages.kadras.io + releaseNotes: https://github.com/jetstack/cert-manager/releases + releasedAt: "2022-10-22T20:56:26Z" + template: + spec: + deploy: + - kapp: {} + fetch: + - imgpkgBundle: + image: ghcr.io/arktonix/package-for-cert-manager@sha256:e0f240e13eb7a75567f0d51a64019ece053bc0b5520f0a8bb3390b126534871f + template: + - ytt: + paths: + - config + - kbld: + paths: + - '-' + - .imgpkg/images.yml + valuesSchema: + openAPIv3: + additionalProperties: false + properties: + namespace: + default: cert-manager + description: The namespace in which to deploy Cert Manager + type: string + type: object + version: 1.10.0 diff --git a/repo/packages/cert-manager.packages.kadras.io/metadata.yml b/repo/packages/cert-manager.packages.kadras.io/metadata.yml index d4902bb..6e31ccc 100644 --- a/repo/packages/cert-manager.packages.kadras.io/metadata.yml +++ b/repo/packages/cert-manager.packages.kadras.io/metadata.yml @@ -1,16 +1,17 @@ apiVersion: data.packaging.carvel.dev/v1alpha1 kind: PackageMetadata metadata: + creationTimestamp: null name: cert-manager.packages.kadras.io spec: - displayName: "cert-manager" - longDescription: "Provides certificate management provisioning within the cluster" - shortDescription: "Certificate management" - providerName: VMware - maintainers: - - name: Nicholas Seemiller categories: - - "security" - - "tls" - - "certificate" - supportDescription: "Go to https://cert-manager.io/ for documentation or the #cert-manager channel on Kubernetes slack" + - certificate + - security + - tls + displayName: cert-manager + iconSVGBase64: <svg xmlns="http://www.w3.org/2000/svg" id="svg3881" width="734.98" height="709.187"><defs id="defs3834"><style id="style3812">.cls-7{fill:#fff}</style><filter id="luminosity-noclip" x="598.71" y="183.45" width="593.98" height="570.22" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-color="#fff" result="bg" id="feFlood3814"/><feBlend in="SourceGraphic" in2="bg" id="feBlend3816"/></filter><mask id="mask" x="598.71" y="183.45" width="593.98" height="570.22" maskUnits="userSpaceOnUse"><g id="g3823" filter="url(#luminosity-noclip)"><path d="M895.7 183.45c-157.46 0-285.11 127.65-285.11 285.11S738.24 753.67 895.7 753.67 1180.81 626 1180.81 468.56 1053.16 183.45 895.7 183.45zm-.07 545.42c-143.81 0-260.21-116.46-260.24-260.27C635.36 324.79 752.1 208 896 208.26c143.9.26 260.14 116.74 260 260.5-.14 143.76-116.58 260.15-260.37 260.11z" id="path3819"/><path d="M875.36 590.92c-8.93-1.41-13.67-3.12-23.71-7.61C824 570.94 802.87 551.16 789 524.5l-1.22.27a9.26 9.26 0 0 1-2 .22 9.37 9.37 0 0 1-7.53-3.83 9.26 9.26 0 0 1-1.37-8.35l2.27-7.19 7.85-25.13a9 9 0 0 1 15.27-3.39l23.26 25.35a9.07 9.07 0 0 1-1.47 13.55 61.2 61.2 0 0 0 14.52 14.56 88.71 88.71 0 0 0 16.26 5.65 181.32 181.32 0 0 0 24.73 4.4V440.2H858.05a18.49 18.49 0 0 1-11 3.64 18.23 18.23 0 0 1-13.57-6.08 18.48 18.48 0 0 1-.11-24.5A18.19 18.19 0 0 1 847 407a18.53 18.53 0 0 1 11 3.6h21.58v-3.33c-13.35-5.77-21.78-16.34-24.44-30.68C851.3 356 864.4 335.5 885 329.92a41.23 41.23 0 0 1 10.74-1.44 41.8 41.8 0 0 1 28.72 11.66 39.94 39.94 0 0 1 12.4 29c0 16.35-7.65 29-22.12 36.74v4.68h18.63a18.88 18.88 0 0 1 11-3.6 18.09 18.09 0 0 1 13.56 6.13 18.49 18.49 0 0 1-.18 24.79 18 18 0 0 1-13.36 5.88 18.81 18.81 0 0 1-11-3.54h-.6c-5.05.3-10.2.34-15.19.39h-2.94v100.98a147 147 0 0 0 18.3-2.35 81.13 81.13 0 0 0 20-6.37 59.65 59.65 0 0 0 14.84-13.31 9 9 0 0 1-.82-13.79l24.71-23.65a9.1 9.1 0 0 1 6.34-2.56 9.19 9.19 0 0 1 9 7c2.56 10.49 5.1 20.87 7.67 31.41a10.12 10.12 0 0 1-9.81 12.53 10.2 10.2 0 0 1-2.58-.33c-12.36 22.51-30.55 39.73-52.75 49.88l-4.09 1.95c-11.35 5.24-17.89 8.25-29.89 9.57l-19.9 19.52zm20-233.29c-6.26 0-11.39 5.17-11.69 11.76a11.56 11.56 0 0 0 3 8.41 11.77 11.77 0 0 0 8.26 3.81h1.08c6.23 0 11.21-5 11.56-11.6.35-6.6-4.55-11.86-11.41-12.39-.16.02-.48.01-.76.01z" id="path3821"/></g></mask><filter id="luminosity-noclip-2" x="583.54" y="-8590.99" width="624.32" height="32766" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-color="#fff" result="bg" id="feFlood3826"/><feBlend in="SourceGraphic" in2="bg" id="feBlend3828"/></filter></defs><g id="Background_wavy_outline" data-name="Background wavy outline" transform="translate(-528.23 -113.97)"><path d="M1263.21 468.56c0 38.68-23.69 73.14-35 108-11.74 36.17-13.24 77.89-35.15 108-22.13 30.41-61.49 44.63-91.9 66.76-30.11 21.91-55.68 55.08-91.84 66.83-34.9 11.33-74.93-.11-113.6-.11-38.67 0-78.7 11.44-113.59.11-36.17-11.75-61.74-44.92-91.85-66.83-30.41-22.13-69.77-36.35-91.9-66.76-21.91-30.1-23.41-71.82-35.15-108-11.33-34.9-35-69.36-35-108s23.69-73.14 35-108c11.74-36.17 13.24-77.89 35.15-108 22.13-30.4 61.49-44.63 91.9-66.75 30.11-21.91 55.68-55.09 91.85-66.83 34.89-11.33 74.92.1 113.59.1s78.7-11.43 113.59-.1c36.17 11.74 61.74 44.92 91.85 66.83 30.41 22.12 69.77 36.35 91.9 66.75 21.91 30.11 23.41 71.83 35.15 108 11.31 34.86 35 69.33 35 108z" id="path3838" fill="#326ce5"/></g><g id="Waves" transform="translate(-528.23 -113.97)"><g mask="url(#mask)" id="g3847" fill="none" stroke="#fff" stroke-miterlimit="10"><path d="M598.71 427.68c42.43 0 42.43 20 84.85 20 42.42 0 42.43-20 84.86-20s42.42 20 84.85 20c42.43 0 42.42-20 84.85-20 42.43 0 42.43 20 84.85 20 42.42 0 42.43-20 84.86-20s42.43 20 84.86 20" id="path3841" stroke-width="3"/><path d="M598.71 467.68c42.43 0 42.43 20 84.85 20 42.42 0 42.43-20 84.86-20s42.42 20 84.85 20c42.43 0 42.42-20 84.85-20 42.43 0 42.43 20 84.85 20 42.42 0 42.43-20 84.86-20s42.43 20 84.86 20" id="path3843" stroke-width="5"/><path d="M598.71 515.68c42.43 0 42.43 20 84.85 20 42.42 0 42.43-20 84.86-20s42.42 20 84.85 20c42.43 0 42.42-20 84.85-20 42.43 0 42.43 20 84.85 20 42.42 0 42.43-20 84.86-20s42.43 20 84.86 20" id="path3845" stroke-width="7"/></g></g><g id="Text" transform="translate(-528.23 -113.97)"><g mask="url(#mask-2)" id="g3878"><g id="Text_and_detail" data-name="Text and detail"><path id="Circle" class="cls-7" d="M895.7 156.4c-172.4 0-312.16 139.76-312.16 312.16 0 172.4 139.76 312.16 312.16 312.16 172.4 0 312.16-139.72 312.16-312.16 0-172.44-139.76-312.16-312.16-312.16zm-.08 597.16c-157.44 0-284.89-127.51-284.92-284.95 0-157.61 127.78-285.3 285.33-285 157.55.3 284.81 127.8 284.67 285.22-.14 157.42-127.64 284.78-285.08 284.73z" fill="#fff"/><g id="LETTERS"><path class="cls-7" d="M751.7 610c-1-3.45-5.75-6.88-9.44-6.42-5.24.67-10.46 1.54-16.76 2.48 2.32-6.15 4.28-11.4 6.28-16.65 1.73-4.56-2-6.77-4.34-9.21-2.34-2.44-4.17.64-5.76 1.9-8.47 6.71-16.68 13.75-25.23 20.35-4.06 3.13-1 4.95.64 7.2 1.64 2.25 3.31 4.78 6.66 1.83 3.86-3.39 7.94-6.54 12-9.83.15.38.29.56.25.68-.8 2.32-1.67 4.62-2.45 6.95-1.63 4.92 1.52 8.51 6.69 7.7 2.15-.34 4.34-1 6.9.1-4.16 3.41-7.77 6.61-11.63 9.46-3.17 2.34-1.65 4.25.26 6s2.71 6.31 6.8 3q13.79-11.12 27.49-22.31c.94-.77 2.15-1.49 1.64-3.23z" id="path3851" fill="#fff"/><path class="cls-7" d="M918.85 273.61c6.54 2.7 9.13 1.46 10.48-5.3.3-1.47.57-2.93.93-4.38.29-1.18 0-3.17 1.81-2.92s4.13-.12 4.79 2.58c.66 2.7 1.48 5.09 2.22 7.63 2.08 7 3.51 8.09 10.64 8.46 2.68.14 3.28-.77 2.57-3.16-1.12-3.81-2.09-7.67-3.28-11.46-.55-1.73-1-2.75 1.37-3.74 5.78-2.44 7.34-7.68 7.75-13.07 0-6.66-4-11.53-11.48-13.53-6.08-1.62-12.32-2.63-18.48-4-2.3-.5-3.45.43-3.88 2.63-2.36 12-4.76 24.08-7.09 36.14-.31 1.63-.54 3.22 1.65 4.12zm17.54-31c5.05-.51 9.92 2.41 9.87 5.4-.05 2.99-1.8 4.44-5.19 4.53-2.09-1.76-6.94 1.1-7.65-3.37-.3-1.89-1-6.11 2.97-6.52z" id="path3853" fill="#fff"/><path class="cls-7" d="M853 664.82c-2.84-.93-5.74-2.1-6.74 2.62-1.09 5.19-2.75 10.25-4.47 16.5-2.63-7.82-5.07-14.52-7.1-21.34-1.33-4.46-5.15-4.42-8.37-5-3.55-.58-2.91 3-3.47 5-3 10.36-5.58 20.86-8.8 31.16-1.58 5.08 2.17 4.62 4.67 5.49 2.66.91 5.47 2 6.48-2.4 1.21-5.27 2.82-10.45 4.45-16.34.67 1.54 1.13 2.42 1.44 3.34 2 6 4.09 11.93 6 17.94 1.37 4.44 5.37 4.17 8.56 4.61 3.19.44 2.53-3 3.06-4.81 3-10.38 5.53-20.89 8.8-31.17 1.49-4.98-1.96-4.76-4.51-5.6z" id="path3855" fill="#fff"/><path class="cls-7" d="M1093.86 601.57c-3.28-.47-6.51-1.44-9.8-1.75-2.71-.25-3.39-1.19-3.48-4-.22-7-6.55-12.74-13.44-12.82-4.73-.13-8.35 2.24-11.25 5.56-3.61 4.13-6.71 8.7-10.33 12.82-2.46 2.81-2.15 4.55.78 6.76 8.76 6.62 17.45 13.35 25.94 20.3 3 2.4 4.51 2.15 6.72-.86 4-5.45 4.16-5.32-1.23-9.5-1.18-.92-2.42-1.78-3.5-2.81-.83-.79-2.89-1.11-1.73-2.91.94-1.45 1.75-3.35 4.16-2.86 2.41.49 5 .56 7.33 1.41 5.37 2 8.71-.09 11.63-4.54 1.93-2.89 2.03-4.26-1.8-4.8zm-30 5.43c-.75.06-6.13-4.56-6.08-5.23.13-1.76 6.28-7.65 8-7.65 2.31.46 4 1.61 4.19 4.15.11 1.55-4.97 8.63-6.11 8.73z" id="path3857" fill="#fff"/><path class="cls-7" d="M845.26 274.6c.35 2 1 3.6 3.49 3.21 9-1.56 18.06-2.91 27-4.77 4.72-1 1.47-4.56 1.52-7 .05-2.61-1.37-3.4-3.93-2.9-4.89.95-9.85 1.6-14.74 2.57-2.54.5-3.21-.66-3.45-2.83-.21-1.93-.49-3.43 2.3-3.74 4.13-.44 8.17-1.61 12.3-2.05 4.47-.48 3.65-3.29 3.17-6.13s-1.08-5.17-5-4.09c-3.67 1-7.56 1.16-11.26 2.09-2.6.66-3.87.5-4.41-2.54-.59-3.28 1.23-3.55 3.55-3.9 4.11-.61 8.2-1.4 12.31-2 2.63-.4 4.65-1.13 3.59-4.44-.85-2.66.36-6.86-5.13-5.72-7.81 1.63-15.68 3-23.58 4-3.78.48-4.3 2.17-3.74 5.31 2.03 11.67 4.02 23.33 6.01 34.93z" id="path3859" fill="#fff"/><path class="cls-7" d="M978.68 669.54a88.5 88.5 0 0 1-8.92 3.07c-2.51.8-4.32 1.82-2.82 5 1.19 2.46.87 6.55 5.62 4.65.87-.35 1.8-1.17 2.65-.11.85 1.06.29 2.32-.13 3.32-1.22 2.87-3.78 4.1-6.65 4.6-2.87.5-5.24-.87-6.67-3.37a32.79 32.79 0 0 1-4-11.2c-.93-5.83 4.62-10.93 9.91-8.38 4.36 2.1 7.64.42 11.34-.66 2.53-.74 2.54-2.25 1.08-4.09-3.38-4.26-8-5.61-13.24-5.83a22.68 22.68 0 0 0-15 5.6c-5 4.48-7 10.16-5 16.65 2.53 8.49 4 18 14.56 20.8 8.1 2.13 15.24-.38 21-6.12 6.23-6.24 4.72-13.51 2-20.92-1.19-3.16-2.35-4.5-5.73-3.01z" id="path3861" fill="#fff"/><path class="cls-7" d="M1040.7 650.65c-3.66 2.86-7.64 5.31-11.31 8.17-2 1.56-3 1.07-4.29-.81-1.29-1.88-1.69-3 .46-4.41 3.33-2.19 6.52-4.59 9.76-6.91 1.06-.76 2.34-1.38 2.22-3.22a13.54 13.54 0 0 0-4.19-5.8c-1.86-1.31-3.3.69-4.75 1.69-3 2.08-6.14 4-8.94 6.34-2.33 1.94-3 .17-4.15-1.21-1.38-1.61-1.4-2.61.53-3.87 3.75-2.45 7.22-5.33 11-7.71 3.1-1.94 2.44-3.82.62-6.06-1.61-2-2.59-5-6.15-2.3-6.52 4.86-13.22 9.49-19.89 14.17-2.1 1.47-2.19 2.93-.72 5 6.9 9.57 13.71 19.2 20.54 28.83 1.24 1.74 2.45 2.43 4.5.94q10.26-7.5 20.69-14.75c3.27-2.27 1.29-4.16-.11-6.21-1.4-2.05-2.73-4.31-5.82-1.88z" id="path3863" fill="#fff"/><path class="cls-7" d="M782.4 634.42c-1.4-1-2.88-.53-4.14.45q-15.18 11.8-30.33 23.64c-1.33 1-2.32 2.47-.4 3.54 3.54 2 6.78 7 11.49 1.72a1.59 1.59 0 0 1 2.18-.47c3.76 2.46 7.55 4.87 11.3 7.33 1 .68.67 1.74.55 2.72-.53 4.29 2.44 9.12 6.71 9.35 4.46.23 2.36-4.48 3.76-6.69a3 3 0 0 0 .34-.94c2.6-10.65 5.2-21.31 8-32.85-1.12-4.32-6.07-5.22-9.46-7.8zm-6.4 26.72c-7.81-4.59-7.81-4.59-1.47-9.65 1.28-1 2.6-2 4.48-3.44a56.33 56.33 0 0 1-3.01 13.09z" id="path3865" fill="#fff"/><path class="cls-7" d="M769.49 297.35c5 6.94 12.68 9 20.82 6 8.46-3.06 15-11.32 14.66-18.87a20.55 20.55 0 0 0-1.24-5.29 2.11 2.11 0 0 0-2.13-1.73c-2.9 0-8.23 5.19-8.27 8.3-.05 4.19-2.73 6.29-6.08 7.63-3.17 1.26-6 0-7.87-2.63a73.14 73.14 0 0 1-5.94-9.75c-1.4-2.87-1.14-6 1.47-8.23 2.61-2.23 5.84-3.74 9.55-1.71 2.6 1.43 9.61-1 11.1-3.53 1-1.62-.28-2.53-1.09-3.43a13.88 13.88 0 0 0-10.8-4.68c-13.38.05-23.81 10.35-22.4 21.61.8 6.34 4.73 11.34 8.22 16.31z" id="path3867" fill="#fff"/><path class="cls-7" d="M911.56 677.13c-3.39-8.82-5.72-10-14.79-8a3.88 3.88 0 0 0-3.27 2.63q-5.7 18.24-11.36 36.54c-.33 1.07-.81 2.33.47 3.17 2.73 1.8 9.9-.72 11.13-3.89.51-1.32.52-2.93 2.71-2.89 4 .08 8 0 12-.19 1.42-.06 2.3.48 2.55 1.76.77 4 3.17 5.18 6.48 4.32 6.77-.17 6.8-.19 4.58-6q-5.24-13.76-10.5-27.45zM901 695.2c-3 0-3.44-.84-2.54-3.39 1.09-3.12 2-6.3 3.27-10.36 1.33 3.4 2.31 5.85 3.24 8.31 2.08 5.57 2.03 5.38-3.97 5.44z" id="path3869" fill="#fff"/><path class="cls-7" d="M999.44 302.68c2.34 1.28 4.57 4.69 7.27.18 3.57-6 7.44-11.79 11.16-17.68 4.48-7.08 4.6-7.29 11.8-2.76 3.83 2.42 4.84-.19 6.45-2.52 1.72-2.5 2.4-4.41-1-6.41q-12-7.15-23.55-14.92c-3.27-2.18-4.89-1.6-7 1.64-2.34 3.57-1.86 5.47 1.76 7.39 2.1 1.11 4.45 2.13 5.9 4.21-.74 1.19-1.34 2.19-2 3.17-4.53 7.16-8.93 14.4-13.62 21.45-2.52 3.88.39 4.91 2.83 6.25z" id="path3871" fill="#fff"/></g><g id="New_Anchor" data-name="New Anchor"><path class="cls-7" d="M1008.89 520.42c-2.57-10.54-5.11-20.92-7.68-31.42a3.2 3.2 0 0 0-5.33-1.56l-24.72 23.66a3.06 3.06 0 0 0 1.26 5.14c.92.26 1.82.51 2.74.7 2 .43 1.8 1.1.87 2.51a65.59 65.59 0 0 1-20 19.58l-.2.12a86.78 86.78 0 0 1-21.7 7 159.35 159.35 0 0 1-23.53 2.72 1.84 1.84 0 0 1-1.9-1.87V436.62a1.08 1.08 0 0 1 1.08-1.08c1 0 2.22.2 5.15.17 5.76-.06 11.76-.06 17.54-.4 1.88-.11 2.93-.05 4.13.85a12.35 12.35 0 0 0 16.71-1.29 12.52 12.52 0 0 0 .11-16.76 12.3 12.3 0 0 0-16.66-1.58 4.07 4.07 0 0 1-2.53 1.08q-12.08-.06-24.14 0a1.9 1.9 0 0 1-1.39-.37v-12.62a1.8 1.8 0 0 1 .42-1.18 6.42 6.42 0 0 1 2-1.41c13-6.6 19.74-17.44 19.75-31.87 0-22.83-22.27-39.44-44.29-33.46-17.46 4.74-28.8 22.08-25.51 39.77 2.42 13 10.07 22.1 22.51 26.92a6.59 6.59 0 0 1 1.33.66 1.8 1.8 0 0 1 .71 1.47v10.32a1.78 1.78 0 0 1-1.8 1.78c-8.65-.1-17.31-.06-26 0a5.53 5.53 0 0 1-3.31-1.12 12.24 12.24 0 0 0-16.62 1.7 12.37 12.37 0 0 0 16.73 18.07 5.08 5.08 0 0 1 3.3-1.08c8.39 0 16.79.12 25.18 0a3.19 3.19 0 0 1 2.17.46 1 1 0 0 1 .31.76v109.81a1.85 1.85 0 0 1-2 1.84 192.44 192.44 0 0 1-30.22-5 92.79 92.79 0 0 1-17.68-6.21 1.56 1.56 0 0 1-.28-.16 66.87 66.87 0 0 1-19.54-21.38 1.38 1.38 0 0 1 1-2.16l2.65-.54a3.08 3.08 0 0 0 1.6-5.08l-23.26-25.35a3 3 0 0 0-5.13 1.14c-3.44 10.89-6.79 21.53-10.19 32.32a3.35 3.35 0 0 0 3.94 4.28l1.8-.41a5.12 5.12 0 0 1 5.69 2.64c13.38 26 33.5 44.81 60.12 56.7 10.4 4.65 14.52 6 23.5 7.37a1.78 1.78 0 0 1 1 .51l13.67 13.55a4.91 4.91 0 0 0 6.85 0l13.28-13a1.88 1.88 0 0 1 1.12-.52c13.3-1.25 19.23-4.54 33.54-11.09 22.15-10.13 39.74-27.76 51.06-49.32 1-1.92 1.88-2.15 3.58-1.58.65.22 1.31.43 2 .63a4.12 4.12 0 0 0 5.21-4.98zm-114.1-131.83a17.72 17.72 0 0 1-17.08-18.49c.48-10.46 9.18-18.18 19-17.43 10.34.8 17.46 9.11 16.94 18.69-.56 10.42-9.1 17.96-18.86 17.23z" id="path3874" fill="#fff"/></g></g></g></g></svg> + longDescription: Automatically provision and manage TLS certificates in Kubernetes + maintainers: + - name: Thomas Vitale + providerName: Arktonix + shortDescription: Cloud native certificate management From 153d94d569f3697f4d57ab3c46546c6105e647a0 Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Sat, 22 Oct 2022 23:16:15 +0200 Subject: [PATCH 4/6] Update package repo documentation --- README.md | 51 ++++++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 1ee64b7..fd91f68 100644 --- a/README.md +++ b/README.md @@ -2,33 +2,30 @@ A collection of Kubernetes-native packages based on [Carvel](https://carvel.dev) and part of the Kadras project. -## Components - -This repository contains the Carvel packages part of the Kadras project. - -The following packages are maintained by the [Arktonix](https://github.com/arktonix) organization: - -* [application-platform](https://github.com/arktonix/kadras-application-platform) -* [argo-cd](https://github.com/arktonix/package-for-argo-cd) -* [cartographer-blueprints](https://github.com/arktonix/cartographer-blueprints) -* [cartographer-delivery](https://github.com/arktonix/cartographer-delivery) -* [cartographer-golden-path-web](https://github.com/arktonix/cartographer-golden-path-web) -* [contour](https://github.com/arktonix/package-for-contour) -* [fluxcd-source-controller](https://github.com/arktonix/package-for-fluxcd-source-controller) -* [knative-eventing](https://github.com/arktonix/package-for-knative-eventing) -* [knative-serving](https://github.com/arktonix/package-for-knative-serving) -* [kpack-dependencies](https://github.com/arktonix/kpack-dependencies) -* [metrics-server](https://github.com/arktonix/package-for-metrics-server) -* [namespace-setup](https://github.com/arktonix/namespace-setup) -* [spring-boot-conventions](https://github.com/arktonix/package-for-spring-boot-conventions) -* [tekton-pipelines](https://github.com/arktonix/package-for-tekton-pipelines) - -It also includes the following open-source packages maintained by the [VMware Tanzu](https://github.com/vmware-tanzu) organization: - -* [cartographer](https://github.com/vmware-tanzu/package-for-cartographer) -* [cert-manager](https://github.com/vmware-tanzu/community-edition/tree/main/addons/packages/cert-manager) -* [kpack](https://github.com/vmware-tanzu/package-for-kpack) -* [secretgen-controller](https://github.com/vmware-tanzu/carvel-secretgen-controller) +## Package Repository + +This repository contains the Carvel packages part of the [Kadras](https://kadras.io) project. + +| Package | Description | +|---------|-------------| +| [application-platform](https://github.com/arktonix/kadras-application-platform) | A curated collection of packages to build an application platform or internal developer platform (IDP) on Kubernetes. | +| [argo-cd](https://github.com/arktonix/package-for-argo-cd) | A declarative and GitOps continuous delivery tool for Kubernetes. | +| [cartographer](https://github.com/vmware-tanzu/package-for-cartographer) | A framework to build paved paths to production using your favourite cloud-native tools. Maintained by [VMware Tanzu](https://github.com/vmware-tanzu). | +| [cartographer-blueprints](https://github.com/arktonix/cartographer-blueprints) | A curated set of reusable blueprints for Cartographer, a Kubernetes-native framework to build paved paths to production. | +| [cartographer-delivery](https://github.com/arktonix/cartographer-delivery) | A curated set of Cartographer delivery chains to deploy workloads to Kubernetes based on GitOps or RegistryOps. | +| [cartographer-golden-path-web](https://github.com/arktonix/cartographer-golden-path-web) | A curated set of Cartographer supply chains to build golden paths to production for web applications and functions, from source code to delivery in a Kubernetes cluster. | +| [cert-manager](https://github.com/arktonix/package-for-cert-manager) | Cloud-native solution to automatically provision and manage TLS certificates in Kubernetes. | +| [contour](https://github.com/arktonix/package-for-contour) | An Envoy-based ingress controller that supports dynamic configuration updates and multi-team ingress delegation. | +| [fluxcd-source-controller](https://github.com/arktonix/package-for-fluxcd-source-controller) | A source management component from the Flux GitOps Toolkit to provide a common interface for artifacts acquisition. | +| [knative-eventing](https://github.com/arktonix/package-for-knative-eventing) | A solution for routing events from event producers to sinks, enabling developers to use an event-driven architecture with their applications. | +| [knative-serving](https://github.com/arktonix/package-for-knative-serving) | A solution built on Kubernetes to support deploying and serving of applications and functions as serverless containers. | +| [kpack](https://github.com/vmware-tanzu/package-for-kpack) | Kubernetes-native container build service based on Cloud Native Buildpacks. Maintained by [VMware Tanzu](https://github.com/vmware-tanzu). | +| [kpack-dependencies](https://github.com/arktonix/kpack-dependencies) | A set of buildpacks, stacks, and builders to use with kpack. | +| [metrics-server](https://github.com/arktonix/package-for-metrics-server) | A scalable and efficient source of container resource metrics for Kubernetes built-in autoscaling pipelines. | +| [namespace-setup](https://github.com/arktonix/namespace-setup) | Sets up up namespaces with the necessary RBAC and Secrets to work with the Kadras platform. | +| [secretgen-controller](https://github.com/vmware-tanzu/carvel-secretgen-controller) | Generates various types of Secrets in-cluster as well as export and import Secrets across namespaces. Maintained by [VMware Tanzu](https://github.com/vmware-tanzu). | +| [spring-boot-conventions](https://github.com/arktonix/package-for-spring-boot-conventions) | Defines conventions for Spring Boot workloads that will be applied by the Cartographer Convention Controller. | +| [tekton-pipelines](https://github.com/arktonix/package-for-tekton-pipelines) | A cloud-native solution for building CI/CD systems. | ## Prerequisites From b442d60b99f0f841526c75e36b658ba581430f8e Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 24 Oct 2022 19:34:28 +0000 Subject: [PATCH 5/6] Update kpack metadata and add version 0.7.1 --- .../kpack.packages.kadras.io/0.7.1.yml | 93 +++++++++++++++++++ .../kpack.packages.kadras.io/metadata.yml | 23 ++--- 2 files changed, 103 insertions(+), 13 deletions(-) create mode 100644 repo/packages/kpack.packages.kadras.io/0.7.1.yml diff --git a/repo/packages/kpack.packages.kadras.io/0.7.1.yml b/repo/packages/kpack.packages.kadras.io/0.7.1.yml new file mode 100644 index 0000000..5cae272 --- /dev/null +++ b/repo/packages/kpack.packages.kadras.io/0.7.1.yml @@ -0,0 +1,93 @@ +apiVersion: data.packaging.carvel.dev/v1alpha1 +kind: Package +metadata: + creationTimestamp: null + name: kpack.packages.kadras.io.0.7.1 +spec: + capacityRequirementsDescription: Registry with > 1GB available space + refName: kpack.packages.kadras.io + releaseNotes: https://github.com/pivotal/kpack/releases + releasedAt: "2022-10-24T19:33:24Z" + template: + spec: + deploy: + - kapp: {} + fetch: + - imgpkgBundle: + image: ghcr.io/arktonix/package-for-kpack@sha256:c4403002c15d82c8f78f4d1d9bf3e4b86a8a3f248876f5ea6fb12481225486e2 + template: + - ytt: + paths: + - config + - kbld: + paths: + - '-' + - .imgpkg/images.yml + valuesSchema: + openAPIv3: + additionalProperties: false + properties: + ca_cert_data: + default: "" + description: 'CA Certificate to be injected into the kpack controller trust + store for communicating with self signed registries. Note: This will not + be injected into builds, you need to use the cert injection webhook with + the kpack.io/build label value' + type: string + kp_default_repository: + default: "" + description: The default repository to use for builder images and dependencies + example: ghcr.io/thomasvitale/kpack + type: string + x-example-description: Repository on GitHub Container Registry + kp_default_repository_aws_iam_role_arn: + default: "" + description: IAM credentials to access kp_default_repository if the registry + is on AWS + type: string + kp_default_repository_password: + default: "" + description: 'Token to access kp_default_repository. Note: Use contents + of service account key json for GCR' + type: string + kp_default_repository_secret: + additionalProperties: false + description: Configuration for the Secret holding the credentials to access + kp_default_repository + properties: + name: + default: "" + description: The name of the Secret holding the credentials to access + kp_default_repository + type: string + namespace: + default: "" + description: The namespace of the Secret holding the credentials to + access kp_default_repository + type: string + type: object + kp_default_repository_username: + default: "" + description: 'Username to access kp_default_repository. Note: Use _json_key + for GCR' + type: string + proxy: + additionalProperties: false + description: Configure proxy support + properties: + http_proxy: + default: "" + description: The HTTP proxy to use for network traffic + type: string + https_proxy: + default: "" + description: The HTTPS proxy to use for network traffic + type: string + no_proxy: + default: "" + description: A comma-separated list of hostnames, IP addresses, or IP + ranges in CIDR format that should not use a proxy + type: string + type: object + type: object + version: 0.7.1 diff --git a/repo/packages/kpack.packages.kadras.io/metadata.yml b/repo/packages/kpack.packages.kadras.io/metadata.yml index cfcff14..8e4b16b 100644 --- a/repo/packages/kpack.packages.kadras.io/metadata.yml +++ b/repo/packages/kpack.packages.kadras.io/metadata.yml @@ -1,20 +1,17 @@ apiVersion: data.packaging.carvel.dev/v1alpha1 kind: PackageMetadata metadata: + creationTimestamp: null name: kpack.packages.kadras.io spec: - displayName: "kpack" - longDescription: "kpack extends Kubernetes and utilizes unprivileged Kubernetes primitives to provide builds of OCI images as a platform implementation of Cloud Native Buildpacks (CNB)." - shortDescription: "kpack builds application source code into OCI compliant images using Cloud Native Buildpacks" - supportDescription: "Go to https://github.com/vmware-tanzu/package-for-kpack and https://github.com/pivotal/kpack for documentation or the #kpack channel on Kubernetes slack" - providerName: "VMware" categories: - - "build" + - build + displayName: kpack + longDescription: kpack extends Kubernetes and utilizes unprivileged Kubernetes primitives + to provide builds of OCI images as a platform implementation of Cloud Native Buildpacks + (CNB) maintainers: - - name: "Matthew McNew" - - name: "Tom Kennedy" - - name: "Tyler Phelan" - - name: "Nicholas Carlson" - - name: "Viraj Patel" - - name: "Matt Gibson" - - name: "Malini Valliath" + - name: Thomas Vitale + providerName: Arktonix + shortDescription: kpack builds application source code into OCI compliant images + using Cloud Native Buildpacks From 2383fc90435a04f78ebe6cd75c7a052dfb587e70 Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Mon, 24 Oct 2022 21:50:36 +0200 Subject: [PATCH 6/6] Add kpack 0.7.1 --- .github/workflows/release.yml | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 86efcf2..bcdf0ff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ env: COSIGN_EXPERIMENTAL: 1 REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} - VERSION: 0.2.3 + VERSION: 0.2.4 jobs: build: diff --git a/README.md b/README.md index fd91f68..38c9f8a 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ This repository contains the Carvel packages part of the [Kadras](https://kadras | [fluxcd-source-controller](https://github.com/arktonix/package-for-fluxcd-source-controller) | A source management component from the Flux GitOps Toolkit to provide a common interface for artifacts acquisition. | | [knative-eventing](https://github.com/arktonix/package-for-knative-eventing) | A solution for routing events from event producers to sinks, enabling developers to use an event-driven architecture with their applications. | | [knative-serving](https://github.com/arktonix/package-for-knative-serving) | A solution built on Kubernetes to support deploying and serving of applications and functions as serverless containers. | -| [kpack](https://github.com/vmware-tanzu/package-for-kpack) | Kubernetes-native container build service based on Cloud Native Buildpacks. Maintained by [VMware Tanzu](https://github.com/vmware-tanzu). | +| [kpack](https://github.com/arktonix/package-for-kpack) | Kubernetes-native container build service based on Cloud Native Buildpacks. | | [kpack-dependencies](https://github.com/arktonix/kpack-dependencies) | A set of buildpacks, stacks, and builders to use with kpack. | | [metrics-server](https://github.com/arktonix/package-for-metrics-server) | A scalable and efficient source of container resource metrics for Kubernetes built-in autoscaling pipelines. | | [namespace-setup](https://github.com/arktonix/namespace-setup) | Sets up up namespaces with the necessary RBAC and Secrets to work with the Kadras platform. | @@ -45,7 +45,7 @@ You can install the Kadras package repository in a dedicated namespace using `kc ```shell kubectl create namespace carvel-packages kctrl package repository add -r kadras-repo \ - --url ghcr.io/arktonix/kadras-packages:0.2.3 \ + --url ghcr.io/arktonix/kadras-packages:0.2.4 \ -n carvel-packages ```