chore: remove obsolete image pull secret configurator

Sgitario · Jun 9, 2022 · 1bcf751 · 1bcf751
1 parent 2b3314d
commit 1bcf751
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 49 deletions.
diff --git a/...e-annotations/src/main/java/io/dekorate/knative/config/DefaultKnativeConfigGenerator.java b/...e-annotations/src/main/java/io/dekorate/knative/config/DefaultKnativeConfigGenerator.java
@@ -19,7 +19,6 @@
 import io.dekorate.WithProject;
 import io.dekorate.config.DefaultConfiguration;
 import io.dekorate.kubernetes.configurator.ApplyDeployToApplicationConfiguration;
-import io.dekorate.kubernetes.configurator.ApplyImagePullSecretConfiguration;
 import io.dekorate.project.ApplyProjectInfo;
 
 public class DefaultKnativeConfigGenerator implements KnativeConfigGenerator, WithProject {
@@ -29,7 +28,6 @@ public class DefaultKnativeConfigGenerator implements KnativeConfigGenerator, Wi
   public DefaultKnativeConfigGenerator(ConfigurationRegistry configurationRegistry) {
     this.configurationRegistry = configurationRegistry;
     on(new DefaultConfiguration<KnativeConfig>(KnativeConfig.newKnativeConfigBuilderFromDefaults()));
-    this.configurationRegistry.add(new ApplyImagePullSecretConfiguration());
     this.configurationRegistry.add(new ApplyProjectInfo(getProject()));
     this.configurationRegistry.add(new ApplyDeployToApplicationConfiguration());
   }

diff --git a/...tations/src/main/java/io/dekorate/kubernetes/config/DefaultKubernetesConfigGenerator.java b/...tations/src/main/java/io/dekorate/kubernetes/config/DefaultKubernetesConfigGenerator.java
@@ -18,7 +18,6 @@
 import io.dekorate.ConfigurationRegistry;
 import io.dekorate.config.DefaultConfiguration;
 import io.dekorate.kubernetes.configurator.ApplyDeployToApplicationConfiguration;
-import io.dekorate.kubernetes.configurator.ApplyImagePullSecretConfiguration;
 import io.dekorate.kubernetes.configurator.PopulateWebPort;
 import io.dekorate.project.ApplyProjectInfo;
 
@@ -29,7 +28,6 @@ public class DefaultKubernetesConfigGenerator implements KubernetesConfigGenerat
   public DefaultKubernetesConfigGenerator(ConfigurationRegistry configurationRegistry) {
     this.configurationRegistry = configurationRegistry;
     this.configurationRegistry.add(new ApplyProjectInfo(getProject()));
-    this.configurationRegistry.add(new ApplyImagePullSecretConfiguration());
     this.configurationRegistry.add(new PopulateWebPort());
     this.configurationRegistry.add(new ApplyDeployToApplicationConfiguration());
     add(new DefaultConfiguration<KubernetesConfig>(KubernetesConfig.newKubernetesConfigBuilderFromDefaults()));

diff --git a/...notations/src/main/java/io/dekorate/openshift/config/DefaultOpenshiftConfigGenerator.java b/...notations/src/main/java/io/dekorate/openshift/config/DefaultOpenshiftConfigGenerator.java
@@ -19,7 +19,6 @@
 import io.dekorate.WithProject;
 import io.dekorate.config.DefaultConfiguration;
 import io.dekorate.kubernetes.configurator.ApplyDeployToApplicationConfiguration;
-import io.dekorate.kubernetes.configurator.ApplyImagePullSecretConfiguration;
 import io.dekorate.kubernetes.configurator.PopulateWebPort;
 import io.dekorate.project.ApplyProjectInfo;
 
@@ -31,7 +30,6 @@ public DefaultOpenshiftConfigGenerator(ConfigurationRegistry configurationRegist
     this.configurationRegistry = configurationRegistry;
     on(new DefaultConfiguration<OpenshiftConfig>(OpenshiftConfig.newOpenshiftConfigBuilderFromDefaults()));
 
-    this.configurationRegistry.add(new ApplyImagePullSecretConfiguration());
     this.configurationRegistry.add(new ApplyProjectInfo(getProject()));
     this.configurationRegistry.add(new PopulateWebPort());
     this.configurationRegistry.add(new ApplyDeployToApplicationConfiguration());

diff --git a/...tekton-annotations/src/main/java/io/dekorate/tekton/manifest/TektonManifestGenerator.java b/...tekton-annotations/src/main/java/io/dekorate/tekton/manifest/TektonManifestGenerator.java
@@ -136,7 +136,7 @@ public class TektonManifestGenerator implements ManifestGenerator<TektonConfig>,
   private static final String DASH = "-";
 
   private static final String MAVEN_LOCAL_REPO_SYS_PROPERTY = "-Dmaven.repo.local=%s";
-  private static final String IMAGE_PULL_SECRETS_SYS_PROPERTY = "-Ddekorate.image-pull-secrets=";
+  private static final String IMAGE_PULL_SECRETS_SYS_PROPERTY = "-Ddekorate.%s.image-pull-secrets=";
   private static final String USER_NAME_SYS_PROP = "-Duser.name=";
 
   private static final String TEKTON = "tekton";
@@ -324,7 +324,7 @@ public void generateCommon(String group, TektonConfig config, ImageConfiguration
         resourceRegistry.decorate(group,
             new AddSecretToServiceAccountDecorator(generatedServiceAccount, config.getImagePushSecret()));
         resourceRegistry.decorate(group, new AddToArgsDecorator(projectBuildTaskName, projectBuildStepName,
-            IMAGE_PULL_SECRETS_SYS_PROPERTY + config.getImagePushSecret()));
+            String.format(IMAGE_PULL_SECRETS_SYS_PROPERTY, group) + config.getImagePushSecret()));
       } else if (config.isUseLocalDockerConfigJson()) {
         String generatedSecret = config.getName() + "-registry-credentials";
         Path dockerConfigJson = Paths.get(System.getProperty("user.home"), ".docker", "config.json");
@@ -336,15 +336,15 @@ public void generateCommon(String group, TektonConfig config, ImageConfiguration
               + " is going to be added as part of Secret: " + generatedSecret);
         }
         resourceRegistry.decorate(group, new AddToArgsDecorator(projectBuildTaskName, projectBuildStepName,
-            IMAGE_PULL_SECRETS_SYS_PROPERTY + generatedSecret));
+            String.format(IMAGE_PULL_SECRETS_SYS_PROPERTY, group) + generatedSecret));
         resourceRegistry.decorate(group,
             new AddDockerConfigJsonSecretDecorator(generatedSecret, dockerConfigJson, annotations));
         resourceRegistry.decorate(group, new AddSecretToServiceAccountDecorator(generatedServiceAccount, generatedSecret));
       } else if (Strings.isNotNullOrEmpty(config.getRegistryUsername())
           && Strings.isNotNullOrEmpty(config.getRegistryPassword())) {
         String generatedSecret = config.getName() + "-registry-credentials";
         resourceRegistry.decorate(group, new AddToArgsDecorator(projectBuildTaskName, projectBuildStepName,
-            IMAGE_PULL_SECRETS_SYS_PROPERTY + generatedSecret));
+            String.format(IMAGE_PULL_SECRETS_SYS_PROPERTY, group) + generatedSecret));
         resourceRegistry.decorate(group, new AddDockerConfigJsonSecretDecorator(generatedSecret, config.getRegistry(),
             config.getRegistryUsername(), config.getRegistryPassword(), annotations));
         resourceRegistry.decorate(group, new AddSecretToServiceAccountDecorator(generatedServiceAccount, generatedSecret));

diff --git a/.../src/main/java/io/dekorate/kubernetes/configurator/ApplyImagePullSecretConfiguration.java b/.../src/main/java/io/dekorate/kubernetes/configurator/ApplyImagePullSecretConfiguration.java