Merge pull request #461 from jorgemoralespou/local-cmd-group

Changes in local and platform set of commands.

carvel-packages/installer/bundle/config/kapp/kapp-config-educates.yaml

@@ -17,4 +17,4 @@ rebaseRules:
  sources: [existing, new]
  resourceMatchers:
  - kindNamespaceNameMatcher: { kind: Secret, name: secrets-manager-token, namespace: educates }
- - kindNamespaceNameMatcher: { kind: Secret, name: session-manager-token, namespace: educates }
+ - kindNamespaceNameMatcher: { kind: Secret, name: session-manager-token, namespace: educates }

carvel-packages/installer/bundle/config/ytt/_ytt_lib/packages/educates/10-secrets-manager/04-serviceaccounts.yaml

@@ -9,5 +9,6 @@ metadata:
  annotations:
  kapp.k14s.io/change-group: #@ "secrets.{}/service-accounts".format(data.values.operator.apiGroup)
  #! Following currently needed for kapp on OpenShift.
- kapp.k14s.io/create-strategy: fallback-on-update
- kapp.k14s.io/update-strategy: skip
+ #! TODO: Bring kapp rebaseRules for Openshift service accounts
+#! kapp.k14s.io/create-strategy: fallback-on-update
+#! kapp.k14s.io/update-strategy: skip

carvel-packages/installer/bundle/config/ytt/_ytt_lib/packages/educates/10-secrets-manager/06-secrets.yaml

@@ -9,5 +9,5 @@ metadata:
  annotations:
  kubernetes.io/service-account.name: "secrets-manager"
  kapp.k14s.io/change-rule: #@ "upsert after upserting secrets.{}/service-accounts".format(data.values.operator.apiGroup)
- kapp.k14s.io/update-strategy: skip
+#! kapp.k14s.io/update-strategy: skip
 type: kubernetes.io/service-account-token

carvel-packages/installer/bundle/config/ytt/_ytt_lib/packages/educates/11-session-manager/04-serviceaccounts.yaml

@@ -9,8 +9,9 @@ metadata:
  annotations:
  kapp.k14s.io/change-group: #@ "training.{}/service-accounts".format(data.values.operator.apiGroup)
  #! Following currently needed for kapp on OpenShift.
- kapp.k14s.io/create-strategy: fallback-on-update
- kapp.k14s.io/update-strategy: skip
+ #! TODO: Bring kapp rebaseRules for Openshift service accounts
+#! kapp.k14s.io/create-strategy: fallback-on-update
+#! kapp.k14s.io/update-strategy: skip
 
 ---
 apiVersion: v1
@@ -20,5 +21,6 @@ metadata:
  namespace: #@ data.values.operator.namespace
  annotations:
  #! Following currently needed for kapp on OpenShift.
- kapp.k14s.io/create-strategy: fallback-on-update
- kapp.k14s.io/update-strategy: skip
+ #! TODO: Bring kapp rebaseRules for Openshift service accounts
+#! kapp.k14s.io/create-strategy: fallback-on-update
+#! kapp.k14s.io/update-strategy: skip

carvel-packages/installer/bundle/config/ytt/_ytt_lib/packages/educates/11-session-manager/06-secrets.yaml

@@ -9,5 +9,5 @@ metadata:
  annotations:
  kubernetes.io/service-account.name: "session-manager"
  kapp.k14s.io/change-rule: #@ "upsert after upserting training.{}/service-accounts".format(data.values.operator.apiGroup)
- kapp.k14s.io/update-strategy: skip
+#! kapp.k14s.io/update-strategy: skip
 type: kubernetes.io/service-account-token

carvel-packages/installer/bundle/config/ytt/config.yaml

@@ -38,5 +38,5 @@
 --- #@ template.replace(overlay.apply(library.get(packagePath).with_data_values(packageValues).eval(), addKappAnnotations(name, overlayedValues, orderedPackagesList)))
 #@ end
 #@ end
---- #@ template.replace(overlay.apply(library.get("config").with_data_values(overlayedValues).eval()))
+--- #@ template.replace(overlay.apply(library.get("config").with_data_values(overlayedValues).eval(), addKappAnnotations("educates", overlayedValues, orderedPackagesList)))
 #@ end

carvel-packages/installer/bundle/config/ytt/functions/kapp-annotations.lib.yaml

@@ -33,6 +33,8 @@ metadata:
  #@overlay/match missing_ok=True
  educates.dev/infra-provider: #@ data.values.clusterInfrastructure.provider
  #@overlay/match missing_ok=True
+ kapp.k14s.io/disable-original: ""
+ #@overlay/match missing_ok=True
  kapp.k14s.io/change-group.package: #@ "educates-installer/{}".format(packageName)
  #@overlay/match missing_ok=True
  kapp.k14s.io/change-group.global: #@ "educates-installer"

client-programs/pkg/cmd/admin_cmd_group.go

@@ -8,7 +8,7 @@ import (
 func (p *ProjectInfo) NewAdminCmdGroup() *cobra.Command {
  var c = &cobra.Command{
  Use: "admin",
- Short: "Tools for installing Educates on Kubernetes",
+ Short: "Tools for administering Educates on Kubernetes",
  }
 
  // Use a command group as it allows us to dictate the order in which they
@@ -19,12 +19,7 @@ func (p *ProjectInfo) NewAdminCmdGroup() *cobra.Command {
  {
  Message: "Available Commands:",
  Commands: []*cobra.Command{
- p.NewAdminClusterCmdGroup(),
  p.NewAdminPlatformCmdGroup(),
- p.NewAdminConfigCmdGroup(),
- p.NewAdminSecretsCmdGroup(),
- p.NewAdminRegistryCmdGroup(),
- p.NewAdminResolverCmdGroup(),
  p.NewAdminDiagnosticsCmdGroup(),
  },
  },

client-programs/pkg/cmd/admin_platform_cmd_group.go

@@ -21,6 +21,7 @@ func (p *ProjectInfo) NewAdminPlatformCmdGroup() *cobra.Command {
  Commands: []*cobra.Command{
  p.NewAdminPlatformDeployCmd(),
  p.NewAdminPlatformDeleteCmd(),
+ p.NewAdminPlatformValuesCmd(),
  },
  },
  }