Merge pull request #514 from navikt/dev

🚀 Deploy
navikt · Jan 18, 2023 · 88d39f2 · 88d39f2
2 parents 2bc6aec + 5cfc41c
commit 88d39f2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/nais-dev.yaml b/nais-dev.yaml
@@ -103,6 +103,9 @@ spec:
         - application: veilarbaktivitet
           namespace: pto
           cluster: dev-fss
+        - application: aktivitetsplan
+          namespace: pto
+          cluster: dev-gcp
   vault:
     enabled: true
     paths:

diff --git a/nais-prod.yaml b/nais-prod.yaml
@@ -101,6 +101,9 @@ spec:
         - application: veilarbaktivitet
           namespace: pto
           cluster: prod-fss
+        - application: aktivitetsplan
+          namespace: pto
+          cluster: prod-gcp
   vault:
     enabled: true
     paths:

diff --git a/src/main/java/no/nav/veilarboppfolging/config/KafkaConfig.java b/src/main/java/no/nav/veilarboppfolging/config/KafkaConfig.java
@@ -17,16 +17,13 @@
 import no.nav.common.kafka.spring.OracleJdbcTemplateConsumerRepository;
 import no.nav.common.kafka.spring.OracleJdbcTemplateProducerRepository;
 import no.nav.common.kafka.util.KafkaPropertiesBuilder;
-import no.nav.common.utils.Credentials;
 import no.nav.pto_schema.kafka.json.topic.onprem.EndringPaaOppfoelgingsBrukerV2;
 import no.nav.veilarboppfolging.service.KafkaConsumerService;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.common.serialization.ByteArrayDeserializer;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.JdbcTemplate;
-
 import javax.annotation.PostConstruct;
 import java.util.List;
 import java.util.Properties;
@@ -57,7 +54,6 @@ public KafkaConfig(
             LockProvider lockProvider,
             KafkaConsumerService kafkaConsumerService,
             KafkaProperties kafkaProperties,
-            Credentials credentials,
             MeterRegistry meterRegistry
     ) {
         KafkaConsumerRepository consumerRepository = new OracleJdbcTemplateConsumerRepository(jdbcTemplate);
@@ -76,23 +72,12 @@ public KafkaConfig(
                         )
         );
 
-        /*
-         * Setter AUTO_OFFSET_RESET_CONFIG (auto.offset.reset) til "none". Dette fordi konsument for topic
-         * pto.endring-paa-oppfolgingsbruker-v2 ikke sjekker om en melding er lest fra før.
-         *
-         * F.eks. for en gitt bruker:
-         *  - melding 1 = "start oppfølging"
-         *  - melding 2 = "avslutt oppfølging"
-         *  - melding 3 = "start oppfølging"
-         * Dersom melding 2 og 3 leses på nytt, så vil oppfølgingsperiode avsluttes, og en ny startes.
-         */
         Properties aivenConsumerProperties = KafkaPropertiesBuilder.consumerBuilder()
                 .withBaseProperties()
                 .withConsumerGroupId(CONSUMER_GROUP_ID)
                 .withAivenBrokerUrl()
                 .withAivenAuth()
                 .withDeserializers(ByteArrayDeserializer.class, ByteArrayDeserializer.class)
-                .withProp(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "none")
                 .build();
 
         aivenConsumerClient = KafkaConsumerClientBuilder.builder()