diff --git a/dist/ge-1-1-6/cluster-scoped-deployment/all-in-one.yaml b/dist/ge-1-1-6/cluster-scoped-deployment/all-in-one.yaml index 8adeaa5..8e42c7a 100644 --- a/dist/ge-1-1-6/cluster-scoped-deployment/all-in-one.yaml +++ b/dist/ge-1-1-6/cluster-scoped-deployment/all-in-one.yaml @@ -448,7 +448,7 @@ spec: key: description: Key of the Secret entry in that holds the value to be used for the EnvironmentVariable type: string - + resourceRequirements: description: > The projected resource requirements of the given EntandoApp deployment. Specifies the limits that the @@ -1943,7 +1943,7 @@ data: app-builder-6-3: >- {"version":"6.3.93-hotfix.1","executable-type":"n/a","registry":"registry.hub.docker.com","organization":"entando","repository":"app-builder"} app-builder-6-4: >- - {"version":"7.3.0","executable-type":"n/a","registry":"registry.hub.docker.com","organization":"entando","repository":"app-builder"} + {"version":"7.3.0-fix.1","executable-type":"n/a","registry":"registry.hub.docker.com","organization":"entando","repository":"app-builder"} busybox: >- {"version":"latest","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-avatar-plugin: >- @@ -1951,7 +1951,7 @@ data: entando-component-manager-6-3: >- {"version":"6.3.26-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-component-manager"} entando-component-manager-6-4: >- - {"version":"7.3.0-fix.2","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-component-manager"} + {"version":"7.3.1-fix.3","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-component-manager"} entando-de-app-eap-6-3: >- {"version":"6.3.68-fix.3-ENG-3332-PR-335","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-eap"} entando-de-app-eap-6-4: >- @@ -1961,27 +1961,27 @@ data: entando-de-app-wildfly-6-4: >- {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-wildfly"} entando-de-app-tomcat-6-4: >- - {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-tomcat"} + {"version":"7.3.0-fix.3","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-tomcat"} entando-k8s-app-controller: >- - {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.3.0-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-app-plugin-link-controller: >- - {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.3.0-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-database-service-controller: >- - {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.3.0-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-dbjob: >- - {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.3.0-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-keycloak-controller: >- - {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.3.0-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-plugin-controller: >- - {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.3.0-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-service: >- - {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.3.0-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-keycloak: >- - {"version":"7.3.0","executable-type":"","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.3.1-fix.3","executable-type":"","registry":"registry.hub.docker.com","organization":"entando"} entando-process-driven-plugin: >- {"version":"6.0.50-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-redhat-sso: >- - {"version":"7.3.0","executable-type":"","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.3.1-fix.3","executable-type":"","registry":"registry.hub.docker.com","organization":"entando"} mysql-80-centos7: >- {"version":"8.0.33","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-mysql-rocky"} postgresql-12-centos7: >- @@ -2227,7 +2227,7 @@ spec: volumes: containers: - name: operator - image: "entando/entando-k8s-controller-coordinator:7.3.0" + image: "entando/entando-k8s-controller-coordinator:7.3.0-fix.1" imagePullPolicy: Always volumeMounts: env: @@ -2353,5 +2353,5 @@ spec: failureThreshold: 1 timeoutSeconds: 1 image: >- - docker.io/entando/entando-k8s-service:7.3.0 + docker.io/entando/entando-k8s-service:7.3.0-fix.1 serviceAccount: entando-operator diff --git a/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml b/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml index 1f14f57..509bbae 100644 --- a/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml +++ b/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml @@ -36,7 +36,7 @@ data: app-builder-6-3: >- {"version":"6.3.93-hotfix.1","executable-type":"n/a","registry":"registry.hub.docker.com","organization":"entando","repository":"app-builder"} app-builder-6-4: >- - {"version":"7.3.0","executable-type":"n/a","registry":"registry.hub.docker.com","organization":"entando","repository":"app-builder"} + {"version":"7.3.0-fix.1","executable-type":"n/a","registry":"registry.hub.docker.com","organization":"entando","repository":"app-builder"} busybox: >- {"version":"latest","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-avatar-plugin: >- @@ -44,7 +44,7 @@ data: entando-component-manager-6-3: >- {"version":"6.3.26-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-component-manager"} entando-component-manager-6-4: >- - {"version":"7.3.0-fix.2","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-component-manager"} + {"version":"7.3.1-fix.3","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-component-manager"} entando-de-app-eap-6-3: >- {"version":"6.3.68-fix.3-ENG-3332-PR-335","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-eap"} entando-de-app-eap-6-4: >- @@ -54,27 +54,27 @@ data: entando-de-app-wildfly-6-4: >- {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-wildfly"} entando-de-app-tomcat-6-4: >- - {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-tomcat"} + {"version":"7.3.0-fix.3","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-tomcat"} entando-k8s-app-controller: >- - {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.3.0-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-app-plugin-link-controller: >- - {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.3.0-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-database-service-controller: >- - {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.3.0-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-dbjob: >- - {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.3.0-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-keycloak-controller: >- - {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.3.0-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-plugin-controller: >- - {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.3.0-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-service: >- - {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.3.0-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-keycloak: >- - {"version":"7.3.0","executable-type":"","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.3.1-fix.3","executable-type":"","registry":"registry.hub.docker.com","organization":"entando"} entando-process-driven-plugin: >- {"version":"6.0.50-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-redhat-sso: >- - {"version":"7.3.0","executable-type":"","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.3.1-fix.3","executable-type":"","registry":"registry.hub.docker.com","organization":"entando"} mysql-80-centos7: >- {"version":"8.0.33","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-mysql-rocky"} postgresql-12-centos7: >- @@ -285,7 +285,7 @@ spec: volumes: containers: - name: operator - image: "entando/entando-k8s-controller-coordinator:7.3.0" + image: "entando/entando-k8s-controller-coordinator:7.3.0-fix.1" imagePullPolicy: Always volumeMounts: env: @@ -415,5 +415,5 @@ spec: failureThreshold: 1 timeoutSeconds: 1 image: >- - docker.io/entando/entando-k8s-service:7.3.0 + docker.io/entando/entando-k8s-service:7.3.0-fix.1 serviceAccount: entando-operator diff --git a/dist/ge-1-1-6/samples/openshift-catalog-source.yaml b/dist/ge-1-1-6/samples/openshift-catalog-source.yaml index ff59766..8adc77d 100644 --- a/dist/ge-1-1-6/samples/openshift-catalog-source.yaml +++ b/dist/ge-1-1-6/samples/openshift-catalog-source.yaml @@ -1,14 +1,14 @@ apiVersion: operators.coreos.com/v1alpha1 kind: CatalogSource metadata: - name: entando-7-3-0 + name: entando-7-3-1 namespace: openshift-marketplace labels: operatorframework.io/arch.amd64: supported operatorframework.io/arch.arm64: supported spec: - displayName: "Entando 7.3.0" - image: registry.hub.docker.com/entandobuilduser/entando-k8s-index@sha256:1a2367aa0ecdbbe03b9a3eed8986836aa546b59a130e9a364696042f1e237558 + displayName: "Entando 7.3.1" + image: registry.hub.docker.com/entando/entando-k8s-index@sha256:ab17ab3906a5eb0e3312631e2951da64b321420762dfda17e4ebbfc6089dfa04 sourceType: grpc updateStrategy: registryPoll: diff --git a/dist/manifest b/dist/manifest index 9df2d7a..9fae9ea 100755 --- a/dist/manifest +++ b/dist/manifest @@ -1,16 +1,16 @@ # ENTANDO VERSION -ENTANDO_RELEASE="v7.3.0" +ENTANDO_RELEASE="v7.3.1" # -------------------------------------------------------------------------------- # OLM INSTALLATIONS - OPERATOR BUNDLE -OPERATOR_BUNDLE_VERSION="v7.3.0" +OPERATOR_BUNDLE_VERSION="v7.3.1" REPO_OPERATOR_BUNDLE_ADDR="https://github.com/entando-k8s/entando-k8s-operator-bundle.git" REPO_OPERATOR_BUNDLE_DIR="entando-k8s-operator-bundle" -OKD_CATALOG_IMAGE="registry.hub.docker.com/entandobuilduser/entando-k8s-index@sha256:1a2367aa0ecdbbe03b9a3eed8986836aa546b59a130e9a364696042f1e237558" +OKD_CATALOG_IMAGE="registry.hub.docker.com/entando/entando-k8s-index@sha256:ab17ab3906a5eb0e3312631e2951da64b321420762dfda17e4ebbfc6089dfa04" # TOOL: ENTANDO CLI -ENTANDO_CLI_VERSION="v7.3.0" +ENTANDO_CLI_VERSION="v7.3.2-fix3" # TOOL: BUNDLER REPO_ENTANDO_BUNDLER_ADDR="https://github.com/entando/entando-bundler" @@ -19,8 +19,8 @@ VER_ENTANDO_BUNDLER_DEF="v7.3.0" # TOOL: entando-bundle-cli REPO_ENTANDO_BUNDLE_CLI_ADDR="https://github.com/entando/entando-bundle-cli" -VER_ENTANDO_BUNDLE_CLI_REQ="v1.2.0" -VER_ENTANDO_BUNDLE_CLI_DEF="v1.2.0" +VER_ENTANDO_BUNDLE_CLI_REQ="v1.2.1" +VER_ENTANDO_BUNDLE_CLI_DEF="v1.2.1" # TOOL: ECR VER_GENERATOR_JHIPSTER_ENTANDO_REQ="v7.3.0" @@ -41,8 +41,8 @@ VER_NODE_REQ="14.*.*" VER_NODE_DEF="v14.20.0" # K3S -VER_K3S_REQ="1.26.*" -VER_K3S_DEF="v1.26.10+k3s2" +VER_K3S_REQ="1.32.*" +VER_K3S_DEF="v1.32.10+k3s1" # OPENSHIFT OKD VER_OKD_REQ="4.13" @@ -51,4 +51,4 @@ VER_OKD_DEF="4.13" # -------------------------------------------------------------------------------- # BASE NAME FOR MANIFESTS -DEPL_SPEC_YAML_FILE="entando-deployment-specs.yaml" +DEPL_SPEC_YAML_FILE="entando-deployment-specs.yaml" \ No newline at end of file diff --git a/dist/manifest.yaml b/dist/manifest.yaml index 4e361b8..71bb863 100644 --- a/dist/manifest.yaml +++ b/dist/manifest.yaml @@ -1,6 +1,6 @@ entando: - main: "v7.3.0" - operator_bundle: "v7.3.0" + main: "v7.3.1" + operator_bundle: "v7.3.1" entando_cli_version: "v7.3.0" dependencies: @@ -23,8 +23,8 @@ dependencies: req_ver: "v1.2.0" def_ver: "v1.2.0" k3s: - req_ver: "1.26.*" - def_ver: "v1.26.10+k3s2" + req_ver: "1.32.*" + def_ver: "v1.32.10+k3s1" okd: req_ver: "4.13" def_ver: "4.13" diff --git a/manifest b/manifest index 9df2d7a..70241c1 100755 --- a/manifest +++ b/manifest @@ -1,16 +1,16 @@ # ENTANDO VERSION -ENTANDO_RELEASE="v7.3.0" +ENTANDO_RELEASE="v7.3.1" # -------------------------------------------------------------------------------- # OLM INSTALLATIONS - OPERATOR BUNDLE -OPERATOR_BUNDLE_VERSION="v7.3.0" +OPERATOR_BUNDLE_VERSION="v7.3.1" REPO_OPERATOR_BUNDLE_ADDR="https://github.com/entando-k8s/entando-k8s-operator-bundle.git" REPO_OPERATOR_BUNDLE_DIR="entando-k8s-operator-bundle" -OKD_CATALOG_IMAGE="registry.hub.docker.com/entandobuilduser/entando-k8s-index@sha256:1a2367aa0ecdbbe03b9a3eed8986836aa546b59a130e9a364696042f1e237558" +OKD_CATALOG_IMAGE="registry.hub.docker.com/entando/entando-k8s-index@sha256:ab17ab3906a5eb0e3312631e2951da64b321420762dfda17e4ebbfc6089dfa04" # TOOL: ENTANDO CLI -ENTANDO_CLI_VERSION="v7.3.0" +ENTANDO_CLI_VERSION="v7.3.2-fix3" # TOOL: BUNDLER REPO_ENTANDO_BUNDLER_ADDR="https://github.com/entando/entando-bundler" @@ -19,8 +19,8 @@ VER_ENTANDO_BUNDLER_DEF="v7.3.0" # TOOL: entando-bundle-cli REPO_ENTANDO_BUNDLE_CLI_ADDR="https://github.com/entando/entando-bundle-cli" -VER_ENTANDO_BUNDLE_CLI_REQ="v1.2.0" -VER_ENTANDO_BUNDLE_CLI_DEF="v1.2.0" +VER_ENTANDO_BUNDLE_CLI_REQ="v1.2.1" +VER_ENTANDO_BUNDLE_CLI_DEF="v1.2.1" # TOOL: ECR VER_GENERATOR_JHIPSTER_ENTANDO_REQ="v7.3.0" @@ -41,8 +41,8 @@ VER_NODE_REQ="14.*.*" VER_NODE_DEF="v14.20.0" # K3S -VER_K3S_REQ="1.26.*" -VER_K3S_DEF="v1.26.10+k3s2" +VER_K3S_REQ="1.32.*" +VER_K3S_DEF="v1.32.10+k3s1" # OPENSHIFT OKD VER_OKD_REQ="4.13"