Revert PR #2804 chart removal

.github/workflows/pull-request.yaml

@@ -19,11 +19,17 @@ jobs:
       - name: Pull scripts
         run: sudo make pull-scripts
 
-      - name: Pull in all relevant branches
-        run: git fetch origin release-v2.6
-      
+      - name: Check release.yaml
+        run: sudo make check-release-yaml
+
       - name: Validate 
         run: sudo make validate
 
       - name: Run Hull tests
-        run: cd tests && go test -v ./...
+        run: cd tests && go test -v ./...
+
+      - name: Check container images 
+        run: make check-images
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/regsync-config.yaml

@@ -1,6 +1,6 @@
-# Generate-Regsync-Config action will checkout release-v2.7 branch, run make regsync target and
-# creates a pull request from rancherbot/charts or rancher/charts release-v2.7 branch with any image additions
-# to regsync config file. This action is triggered whenever something is pushed into release-v2.7 branch.
+# Generate-Regsync-Config action will run for every PR into release-v2.7 branch only after an approval is given 
+# It will run make target to generate regsync file and add a commit to the PR updating the regsync file. 
+# It will then install and run regsync client and do the prime image mirroring.
 
 name: Generate-Regsync-Config
 
@@ -16,17 +16,24 @@ jobs:
       - uses: actions/checkout@v3
 
       # Need to remove export version once rancher/charts gets the latest version 
-      # of charts-build-script binary.
-
-      - name: Generate Regsync Config
+      # of charts-build-script binary.   
+      - name: Generate RegSync & Commit
         run: |
+          gh pr checkout ${{ github.event.pull_request.number }}
           export CHARTS_BUILD_SCRIPT_VERSION=v0.4.2 
           make pull-scripts
           make regsync
+          git add regsync.yaml
+          git config --global user.name "Github Action RegSync"
+          git config --global user.email "github@action.com"
+          git commit -m "Updating regsync.yaml"
+          git push
+        env:
+          GH_TOKEN: ${{ github.token }}
 
       - name: Install Regsync
         run: |
-          curl --silent --fail --location --output regsync https://github.com/regclient/regclient/releases/download/v0.4.8/regsync-linux-amd64
+          curl --silent --fail --location --output regsync https://github.com/regclient/regclient/releases/download/v0.5.1/regsync-linux-amd64
           chmod +x regsync
 
       - name: Sync Images to Registry

Makefile

@@ -7,7 +7,10 @@ remove:
 forward-port:
 	./scripts/forward-port
 
-TARGETS := prepare patch clean clean-cache charts list index unzip zip standardize validate template regsync
+check-release-yaml:
+	./scripts/check-release-yaml
+
+TARGETS := prepare patch clean clean-cache charts list index unzip zip standardize validate template regsync check-images
 
 $(TARGETS):
 	@./scripts/pull-scripts

charts/epinio-crd/102.0.4+up1.9.0/Chart.yaml

@@ -0,0 +1,10 @@
+annotations:
+  catalog.cattle.io/certified: rancher
+  catalog.cattle.io/hidden: "true"
+  catalog.cattle.io/namespace: cattle-epinio-system
+  catalog.cattle.io/release-name: epinio-crd
+apiVersion: v2
+description: Installs the CRDs for Epinio.
+name: epinio-crd
+type: application
+version: 102.0.4+up1.9.0

charts/epinio-crd/102.0.4+up1.9.0/README.md

@@ -0,0 +1,2 @@
+# epinio-crd
+A Rancher chart that installs the CRDs used by epinio.

charts/epinio-crd/102.0.4+up1.9.0/templates/app-crd.yaml

@@ -0,0 +1,118 @@
+# Copied from here:
+# https://github.com/epinio/application/blob/main/config/crd/bases/application.epinio.io_apps.yaml
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.4.1
+  creationTimestamp: null
+  name: apps.application.epinio.io
+spec:
+  group: application.epinio.io
+  names:
+    kind: App
+    listKind: AppList
+    plural: apps
+    singular: app
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: App is the Schema for the apps API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: AppSpec defines the desired state of App
+            properties:
+              blobuid:
+                description: BlobUID stores the blob uid that was used when the application
+                  was last staged (from code). It can be empty if the application
+                  was never staged (e.g. pushed with container image). Epinio will
+                  use the value set by the user explicitly but if one is not set,
+                  it will try to use the previously set blobUID from the application
+                  CRD.
+                type: string
+              builderimage:
+                description: This field stores the builder image that was used when
+                  the application was last staged (from code). It can be empty if
+                  the application was never staged (e.g. pushed with container image).
+                  Epinio will use the builder image set by the user explicitly but
+                  if one is not set, it will try to use the previously set image.
+                type: string
+              chartname:
+                description: ChartName stores the name of the application support
+                  chart used to deploy the currently running application. This is
+                  set on deployment, for use in updates. The name references an epinio
+                  AppCharts resource.
+                type: string
+              imageurl:
+                description: ImageURL stores the image reference of the currently
+                  running application. This is set on deployment, for use in updates.
+                type: string
+              origin:
+                properties:
+                  archive:
+                    type: boolean
+                  container:
+                    type: string
+                  git:
+                    properties:
+                      branch:
+                        type: string
+                      provider:
+                        type: string
+                      repository:
+                        type: string
+                      revision:
+                        type: string
+                    required:
+                    - repository
+                    type: object
+                  path:
+                    type: string
+                type: object
+              routes:
+                items:
+                  type: string
+                type: array
+              settings:
+                additionalProperties:
+                  type: string
+                description: Settings stores the fields and values set by the user
+                  to configure the application chart. See ChartName.
+                type: object
+              stageid:
+                description: StageID stores the id of the latest attempt to stage
+                  the application, regardless of outcome. This enables access to the
+                  staging logs of an application which never staged successfully.
+                type: string
+            required:
+            - origin
+            type: object
+          status:
+            description: AppStatus defines the observed state of App
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

charts/epinio-crd/102.0.4+up1.9.0/templates/appcharts-crd.yaml

@@ -0,0 +1,108 @@
+# Copied from here:
+# https://github.com/epinio/application/blob/main/config/crd/bases/application.epinio.io_appcharts.yaml
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.4.1
+  creationTimestamp: null
+  name: appcharts.application.epinio.io
+spec:
+  group: application.epinio.io
+  names:
+    kind: AppChart
+    listKind: AppChartList
+    plural: appcharts
+    singular: appchart
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: AppChart is the Schema for the appcharts API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: AppChartSpec defines the desired state of AppChart
+            properties:
+              description:
+                description: Description of the chart. Long form to be used in detailed
+                  displays
+                type: string
+              helmChart:
+                description: HelmChart is the name of the Helm chart used to deploy
+                  an application.
+                type: string
+              helmRepo:
+                description: HelmRepo is the URL to the Helm repository where to fetch
+                  the helm chart. This can be empty. In that case the HelmChart field
+                  has to reference the chart as full URL instead of as a simple name.
+                type: string
+              settings:
+                additionalProperties:
+                  description: AppChartSetting is an older name for ChartSetting.
+                    Created to keep backward compatibility. Should also reduce misunderstandings
+                    of what kind of settings are handled in a particular context.
+                  properties:
+                    enum:
+                      description: Enumeration of allowed values, for types string,
+                        number, integer
+                      items:
+                        type: string
+                      type: array
+                    maximum:
+                      description: Maximal allowed value, for number, integer
+                      type: string
+                    minimum:
+                      description: Minimal allowed value, for number, integer
+                      type: string
+                    type:
+                      description: Type of the setting (string, bool, number, or integer)
+                      type: string
+                  required:
+                  - type
+                  type: object
+                description: Settings declares the fields underneath `userValues`
+                  the user is allowed to customize when deploying an application with
+                  the helm chart referenced by this app chart.
+                type: object
+              shortDescription:
+                description: ShortDescription of the chart. To be used in list displays
+                type: string
+              values:
+                additionalProperties:
+                  type: string
+                description: Values provides settings, i.e. field names and values
+                  to customize the referenced helm chart when deploying an application
+                  with this app chart. Note that user-configurable settings are declared
+                  with `Settings` instead. While nothing checks against exposing a
+                  field set here to the user this is strongly discouraged, to avoid
+                  confusion.
+                type: object
+            type: object
+          status:
+            description: AppChartStatus defines the observed state of AppChart
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []