Merge branch 'main' into 3661-appRepoCustomInterval and fix more

conflicts
vmware-tanzu · Nov 17, 2022 · 90b9ab0 · 90b9ab0
2 parents 0a32eb8 + 0c3b815
commit 90b9ab0
Show file tree

Hide file tree

Showing 38 changed files with 975 additions and 1,435 deletions.
diff --git a/.github/actions/srp-source-provenance/action.yml b/.github/actions/srp-source-provenance/action.yml
@@ -75,11 +75,13 @@ runs:
         export COMP_UID=${COMP_UID//\//\%2f}
         export SRP_UID="uid.mtd.provenance_2_5.fragment(obj_uid=$COMP_UID,revision='')"
         echo "SRP_UID: ${SRP_UID}"
+        echo "SOURCE PROVENANCE FILE CONTENT:"
         cat /tmp/provenance/source.json
+        echo ""
         srp uid validate ${SRP_UID}
         srp metadata submit \
         --verbose \
-        --url https://apigw.vmware.com/v1/s1/api/helix-beta \
+        --srp-endpoint https://apigw.vmware.com/v1/s1/api/helix-beta \
         --uid "${SRP_UID}" \
         --path /tmp/provenance/source.json
     - name: Upload SRP file as a build artifact

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -4,16 +4,16 @@
 
 | Maintainer         | GitHub ID                                           |                              Affiliation |
 | ------------------ | --------------------------------------------------- | ---------------------------------------: |
-| Antonio Gámez Díaz | [antgamdia](https://github.com/antgamdia)           | [VMware](https://www.github.com/vmware/) |
 | Dimitri Laloue     | [dlaloue-vmware](https://github.com/dlaloue-vmware) | [VMware](https://www.github.com/vmware/) |
 | Greg Fichtenholtz  | [gfichtenholt](https://github.com/gfichtenholt)     | [VMware](https://www.github.com/vmware/) |
-| Jesús Benito       | [beni0888](https://github.com/beni0888)             | [VMware](https://www.github.com/vmware/) |
 | Michael Nelson     | [absoludity](https://github.com/absoludity)         | [VMware](https://www.github.com/vmware/) |
 | Pepe Baena         | [ppbaena](https://github.com/ppbaena)               | [VMware](https://www.github.com/vmware/) |
-| Rafa Castelblanque | [castelblanque](https://github.com/castelblanque)   | [VMware](https://www.github.com/vmware/) |
 
 ## Emeritus Maintainers
 
+- Jesús Benito ([beni0888](https://github.com/beni0888))
+- Antonio Gámez Díaz ([antgamdia](https://github.com/antgamdia))
+- Rafa Castelblanque ([castelblanque](https://github.com/castelblanque))
 - Andrés Martínez Gotor ([andresmgot](https://github.com/andresmgot))
 - Adnan Abdulhussein ([prydonius](https://github.com/prydonius))
 - Ara Pulido ([arapulido](https://github.com/arapulido))

diff --git a/chart/kubeapps/README.md b/chart/kubeapps/README.md
@@ -463,7 +463,6 @@ Once you have installed Kubeapps follow the [Getting Started Guide](https://gith
 | `kubeappsapis.pluginConfig.core.packages.v1alpha1.versionsInSummary.patch`                      | Number of patch versions to display in the summary                                                                                                                         | `3`                                |
 | `kubeappsapis.pluginConfig.core.packages.v1alpha1.timeoutSeconds`                               | Value to wait for Kubernetes commands to complete                                                                                                                          | `300`                              |
 | `kubeappsapis.pluginConfig.helm.packages.v1alpha1.globalPackagingNamespace`                     | Custom global packaging namespace. Using this value will override the current "kubeapps release namespace + suffix" pattern and will create a new namespace if not exists. | `""`                               |
-| `kubeappsapis.pluginConfig.helm.packages.v1alpha1.userManagedSecrets`                           | Default policy for handling repository secrets, either managed by the user or by kubeapps-apis                                                                             | `false`                            |
 | `kubeappsapis.pluginConfig.kappController.packages.v1alpha1.defaultUpgradePolicy`               | Default upgrade policy generating version constraints                                                                                                                      | `none`                             |
 | `kubeappsapis.pluginConfig.kappController.packages.v1alpha1.defaultPrereleasesVersionSelection` | Default policy for allowing prereleases containing one of the identifiers                                                                                                  | `nil`                              |
 | `kubeappsapis.pluginConfig.kappController.packages.v1alpha1.defaultAllowDowngrades`             | Default policy for allowing applications to be downgraded to previous versions                                                                                             | `false`                            |

diff --git a/chart/kubeapps/values.yaml b/chart/kubeapps/values.yaml
@@ -1513,8 +1513,6 @@ kubeappsapis:
         v1alpha1:
           ## @param kubeappsapis.pluginConfig.helm.packages.v1alpha1.globalPackagingNamespace Custom global packaging namespace. Using this value will override the current "kubeapps release namespace + suffix" pattern and will create a new namespace if not exists.
           globalPackagingNamespace: ""
-          ## @param kubeappsapis.pluginConfig.helm.packages.v1alpha1.userManagedSecrets Default policy for handling repository secrets, either managed by the user or by kubeapps-apis
-          userManagedSecrets: false
     kappController:
       packages:
         v1alpha1:

diff --git a/cmd/kubeapps-apis/docs/kubeapps-apis.swagger.json b/cmd/kubeapps-apis/docs/kubeapps-apis.swagger.json
@@ -4445,14 +4445,6 @@
         }
       }
     },
-    "pluginshelmpackagesv1alpha1SetUserManagedSecretsResponse": {
-      "type": "object",
-      "properties": {
-        "value": {
-          "type": "boolean"
-        }
-      }
-    },
     "protobufAny": {
       "type": "object",
       "properties": {